diff --git a/build/android/Android.mk b/build/android/Android.mk
index f009cf295..c2b04b389 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -199,13 +199,12 @@ LOCAL_SRC_FILES  += $(LIBLINPHONE_EXTENDED_SRC_FILES)
 LOCAL_CFLAGS += $(LIBLINPHONE_EXTENDED_CFLAGS)
 
 
-ifeq ($(BUILD_GPLV3_ZRTP),1)
-	LOCAL_SHARED_LIBRARIES += libssl-linphone libcrypto-linphone
-	LOCAL_SHARED_LIBRARIES += libbzrtp
+ifeq ($(BUILD_ZRTP),1)
+	LOCAL_STATIC_LIBRARIES += libbzrtp
 endif
 
 ifeq ($(BUILD_SRTP),1)
-	LOCAL_SHARED_LIBRARIES += libsrtp
+	LOCAL_STATIC_LIBRARIES += libsrtp
 endif
 
 ifeq ($(BUILD_SQLITE),1)
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 8b1527b09..85bff8ffa 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -57,10 +57,6 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 			loadOptionalLibrary("avcodec-linphone-arm");
 		}
 
-		// Secure RTP and key negotiation
-		loadOptionalLibrary("srtp-" + eabi);
-		loadOptionalLibrary("zrtpcpp-" + eabi); // GPLv3+
-
 		//Main library
 		System.loadLibrary("linphone-" + eabi);
 
diff --git a/oRTP b/oRTP
index 5008a70e0..393857c0e 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 5008a70e077b3706de4a48374f162f93071b4d08
+Subproject commit 393857c0e8e5cab10a8d647cc89c8390355745a7