diff --git a/liblinphone_tester/.classpath b/liblinphone_tester/.classpath
index ecf4445b1..d48ac0e1b 100644
--- a/liblinphone_tester/.classpath
+++ b/liblinphone_tester/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="src" path="mediastreamer2"/>
+	<classpathentry excluding="org/linphone/mediastream/MediastreamerActivity.java" kind="src" path="mediastreamer2"/>
 	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
diff --git a/submodules/belle-sip b/submodules/belle-sip
index eb411e1eb..b29b7d950 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit eb411e1eb623ea8e599450c4d2b30a8b39e65759
+Subproject commit b29b7d95039c1cc3c7888d794e3eebe1ecbc92ff
diff --git a/submodules/linphone b/submodules/linphone
index 10a18463d..afa3a8437 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 10a18463d51c68e436267fe6154f1216b0351918
+Subproject commit afa3a843712e379aeba6af3493349e361956bcdf