diff --git a/build/android/Android.mk b/build/android/Android.mk
index 9dfd049fa..0947223d4 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -46,6 +46,7 @@ LOCAL_SRC_FILES := \
 	call_log.c \
 	call_params.c \
 	chat.c \
+	chat_file_transfer.c \
 	conference.c \
 	content.c \
 	ec-calibrator.c \
diff --git a/mediastreamer2 b/mediastreamer2
index 1eb5e66e0..1f4937398 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 1eb5e66e05630f0338ed6f9d5c89f913bbf24774
+Subproject commit 1f49373988d7620e80d810a0f03d69f521bf1511