diff --git a/jni/Android.mk b/jni/Android.mk
index 83d20958c..aa5b33e45 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -57,8 +57,8 @@ ifeq ($(BUILD_MATROSKA), 1)
 include $(linphone-root-dir)/submodules/externals/build/libmatroska/Android.mk
 endif
 
-ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0)
 include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk
+ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0)
 include $(linphone-root-dir)/submodules/externals/build/antlr3/Android.mk
 include $(linphone-root-dir)/submodules/belle-sip/build/android/Android.mk
 endif
diff --git a/submodules/linphone b/submodules/linphone
index 29f556302..c0b7ae835 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 29f556302fc33eddec9196d3b05dbb7bcc9570c3
+Subproject commit c0b7ae8359a83deac4814f3047bcb9764599d1dc