diff --git a/build/android/Android.mk b/build/android/Android.mk
index fbdeff652..cabeccd8f 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -71,7 +71,8 @@ LOCAL_SRC_FILES := \
 	siplogin.c \
 	sipsetup.c \
 	xml2lpc.c \
-	xml.c
+	xml.c \
+	vtables.c
 
 ifndef LIBLINPHONE_VERSION
 LIBLINPHONE_VERSION = "Devel"
diff --git a/mediastreamer2 b/mediastreamer2
index babbf1c36..b16d34d50 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit babbf1c36c38a8b301a2a24667ac16f2ff03c795
+Subproject commit b16d34d50314f346263dc68bd9e25cc174a2a9ad