diff --git a/build/android/Android.mk b/build/android/Android.mk
index 8dfe0cb84d81311fc87f44443f53084c9d33817e..8c64fae8acedd3bfe672ecc4428e21f0c94d0597 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -105,9 +105,6 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/../../externals/libxml2/include \
 	$(LOCAL_PATH)/../../externals/build/libxml2
 
-ifeq ($(BUILD_OPENSLES_SOUNDCARD),1)
-	LOCAL_LDLIBS += -lOpenSLES 
-endif
 LOCAL_LDLIBS += -llog -ldl
 
 LOCAL_STATIC_LIBRARIES := \
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 521a3d6b1b0c8935c6bb1da9985a2b21eda24fd7..8b1527b0976f52f3e9970f6e1ea06c071854d776 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -57,11 +57,6 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 			loadOptionalLibrary("avcodec-linphone-arm");
 		}
 
-		// OPENSSL (cryptography)
-		// linphone suffix avoids collision with libs in /system/lib
-		loadOptionalLibrary("crypto-linphone-" + eabi);
-		loadOptionalLibrary("ssl-linphone-" + eabi);
-
 		// Secure RTP and key negotiation
 		loadOptionalLibrary("srtp-" + eabi);
 		loadOptionalLibrary("zrtpcpp-" + eabi); // GPLv3+
diff --git a/mediastreamer2 b/mediastreamer2
index bba5dff9ea4d4b6bc84d6b9b1e17469a3f8e6869..509430ba06b18bbfb7d2d820ad86c7dcdb22af99 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit bba5dff9ea4d4b6bc84d6b9b1e17469a3f8e6869
+Subproject commit 509430ba06b18bbfb7d2d820ad86c7dcdb22af99