Conflicts: .gitmodules Makefile submodules/externals/build/exosip/Android.mk submodules/externals/exosip submodules/linphone