diff --git a/build/android/Android.mk b/build/android/Android.mk
index 14d2b8f59..529fc02ee 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -65,8 +65,8 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/../oRTP/include \
 	$(LOCAL_PATH)/../mediastreamer2/include \
-	$(LOCAL_PATH)/../../../eXosip/include \
-	$(LOCAL_PATH)/../../../osip/include 
+	$(LOCAL_PATH)/../../externals/exosip/include \
+	$(LOCAL_PATH)/../../externals/osip/include 
 
 LOCAL_LDLIBS += -llog
 
diff --git a/mediastreamer2 b/mediastreamer2
index 2e02b06af..f53b256d2 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 2e02b06af897fa1ed25b6e24bd3096c2c88374bf
+Subproject commit f53b256d27b69481ac375c5ce2262888df084354