diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 5b676ebce..02b0a5a5f 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -53,6 +53,10 @@ static void linphone_android_log_handler(OrtpLogLevel lev, const char *fmt, va_l
 	}
 	__android_log_vprint(prio, LOG_DOMAIN, fmt, args);
 }
+
+int dumbMethodForAllowingUsageOfCpuFeaturesFromStaticLibMediastream() {
+	return (android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM && (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0);
+}
 #endif /*ANDROID*/
 
 JNIEXPORT jint JNICALL  JNI_OnLoad(JavaVM *ajvm, void *reserved)
@@ -1351,17 +1355,6 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_adjustSoftwareVolume(JNI
 	linphone_core_set_playback_gain_db((LinphoneCore *) ptr, db);
 }
 
-extern "C" jboolean Java_org_linphone_core_Version_nativeHasNeon(JNIEnv *env){
-	if (android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM && (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0)
-	{
-		return 1;
-	}
-	return 0;
-}
-extern "C" jboolean Java_org_linphone_core_Version_nativeHasZrtp(JNIEnv *env){
-	return ortp_zrtp_available();
-}
-
 extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_pauseCall(JNIEnv *env,jobject thiz,jlong pCore, jlong pCall) {
 	return linphone_core_pause_call((LinphoneCore *) pCore, (LinphoneCall *) pCall);
 }
diff --git a/mediastreamer2 b/mediastreamer2
index 87b86a0c0..3ebe0396c 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 87b86a0c0aa048a23249811979edcd360723e9da
+Subproject commit 3ebe0396cbdb8cd49c0bbf262a87a9160bd13e64