diff --git a/liblinphone_tester/.classpath b/liblinphone_tester/.classpath
index cfe7064fb..0e0620221 100644
--- a/liblinphone_tester/.classpath
+++ b/liblinphone_tester/.classpath
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="linphone/j2se"/>
 	<classpathentry kind="src" path="linphone/impl"/>
 	<classpathentry kind="src" path="linphone/common"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry excluding="org/linphone/mediastream/MediastreamerActivity.java" kind="src" path="mediastreamer2"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/submodules/linphone b/submodules/linphone
index deaaf0a19..2630a9b0f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit deaaf0a19b20f55ad258fb4a6b95a84af32146cc
+Subproject commit 2630a9b0f0b4cfccf0f7c84ac0b81eca22176023