diff --git a/build/android/Android.mk b/build/android/Android.mk
index f88c0e117..235056c54 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -148,6 +148,12 @@ LOCAL_CFLAGS += -DHAVE_SILK
 LOCAL_STATIC_LIBRARIES += libmssilk
 endif
 
+ifeq ($(BUILD_WEBRTC_ISAC),1)
+LOCAL_CFLAGS += -DHAVE_ISAC
+LOCAL_STATIC_LIBRARIES += libwebrtc_isacfix_neon
+LOCAL_STATIC_LIBRARIES += libwebrtc_spl libwebrtc_isacfix libmsisac
+endif
+
 ifeq ($(BUILD_G729),1)
 LOCAL_CFLAGS += -DHAVE_G729
 LOCAL_STATIC_LIBRARIES += libbcg729 libmsbcg729
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index b44c61c1a..efc5df7a6 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -48,6 +48,9 @@ extern "C" void libmssilk_init();
 #ifdef HAVE_G729
 extern "C" void libmsbcg729_init();
 #endif
+#ifdef HAVE_ISAC
+extern "C" void libmsisac_init();
+#endif
 #endif /*ANDROID*/
 
 
@@ -717,11 +720,16 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
 #ifdef HAVE_G729
 	libmsbcg729_init();
 #endif
+#ifdef HAVE_ISAC
+    libmsisac_init();
+#endif
+
 	jlong nativePtr = (jlong)linphone_core_new(	&ldata->vTable
 			,userConfig
 			,factoryConfig
 			,ldata);
 
+
 	if (userConfig) env->ReleaseStringUTFChars(juserConfig, userConfig);
 	if (factoryConfig) env->ReleaseStringUTFChars(jfactoryConfig, factoryConfig);
 	return nativePtr;
@@ -4342,6 +4350,8 @@ JNIEXPORT jstring JNICALL Java_org_linphone_core_PayloadTypeImpl_getSendFmtp(JNI
 	const char *fmtp=pt->send_fmtp;
 	return fmtp ? env->NewStringUTF(fmtp) : NULL;
 }
+
+
   
   
 
diff --git a/mediastreamer2 b/mediastreamer2
index 9a9268544..3433e47bc 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 9a92685445683036958df701d2e07078119415b9
+Subproject commit 3433e47bc8ed15b2800bbd448f6d22f79285e66d