diff --git a/jni/Android.mk b/jni/Android.mk
index 9023b7e9c..bf21aee00 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -76,7 +76,7 @@ endif
 include $(linphone-root-dir)/submodules/linphone/oRTP/build/android/Android.mk
 
 include $(linphone-root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk
-include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tests/Android.mk
+include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tools/Android.mk
 
 
 ifeq ($(BUILD_TUNNEL), 1)
diff --git a/submodules/linphone b/submodules/linphone
index b5db1828f..1d3ba8e0b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b5db1828fa4594cad1f3563606f25c738606057e
+Subproject commit 1d3ba8e0b67d654b872e51db2cb5e00b8577b057
diff --git a/submodules/msilbc b/submodules/msilbc
index 7320dbb52..32a39741b 160000
--- a/submodules/msilbc
+++ b/submodules/msilbc
@@ -1 +1 @@
-Subproject commit 7320dbb5294f4fc92d80e794cb805185934ea16b
+Subproject commit 32a39741b64d74999134f5e6425609c4cfff5daf