diff --git a/prepare.py b/prepare.py
index 59e04c8b5..c024da03e 100755
--- a/prepare.py
+++ b/prepare.py
@@ -230,12 +230,10 @@ copy-libs:
 \trm -rf libs/armeabi
 \tif test -d "liblinphone-sdk/android-arm"; then \\
 \t\tmkdir -p libs-debug/armeabi && \\
-\t\tcp -f liblinphone-sdk/android-arm/lib/libgnustl_shared.so libs-debug/armeabi && \\
-\t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs-debug/armeabi && \\
+\t\tcp -f liblinphone-sdk/android-arm/lib/lib*.so libs-debug/armeabi && \\
 \t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs-debug/armeabi && \\
 \t\tmkdir -p libs/armeabi && \\
-\t\tcp -f liblinphone-sdk/android-arm/lib/libgnustl_shared.so libs/armeabi && \\
-\t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs/armeabi && \\
+\t\tcp -f liblinphone-sdk/android-arm/lib/lib*.so libs/armeabi && \\
 \t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs/armeabi && \\
 \t\tsh WORK/android-arm/strip.sh libs/armeabi/*.so; \\
 \tfi
@@ -249,12 +247,10 @@ copy-libs:
 \trm -rf libs/armeabi-v7a
 \tif test -d "liblinphone-sdk/android-armv7"; then \\
 \t\tmkdir -p libs-debug/armeabi-v7a && \\
-\t\tcp -f liblinphone-sdk/android-armv7/lib/libgnustl_shared.so libs-debug/armeabi-v7a && \\
-\t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs-debug/armeabi-v7a && \\
+\t\tcp -f liblinphone-sdk/android-armv7/lib/lib*.so libs-debug/armeabi-v7a && \\
 \t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs-debug/armeabi-v7a && \\
 \t\tmkdir -p libs/armeabi-v7a && \\
-\t\tcp -f liblinphone-sdk/android-armv7/lib/libgnustl_shared.so libs/armeabi-v7a && \\
-\t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs/armeabi-v7a && \\
+\t\tcp -f liblinphone-sdk/android-armv7/lib/lib*.so libs/armeabi-v7a && \\
 \t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a && \\
 \t\tsh WORK/android-armv7/strip.sh libs/armeabi-v7a/*.so; \\
 \tfi
@@ -268,12 +264,10 @@ copy-libs:
 \trm -rf libs/arm64-v8a
 \tif test -d "liblinphone-sdk/android-arm64"; then \\
 \t\tmkdir -p libs-debug/arm64-v8a && \\
-\t\tcp -f liblinphone-sdk/android-arm64/lib/libgnustl_shared.so libs-debug/arm64-v8a && \\
-\t\tcp -f liblinphone-sdk/android-arm64/lib/lib*-arm64-v8a.so libs-debug/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/lib*.so libs-debug/arm64-v8a && \\
 \t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs-debug/arm64-v8a && \\
 \t\tmkdir -p libs/arm64-v8a && \\
-\t\tcp -f liblinphone-sdk/android-arm64/lib/libgnustl_shared.so libs/arm64-v8a && \\
-\t\tcp -f liblinphone-sdk/android-arm64/lib/lib*-arm64-v8a.so libs/arm64-v8a && \\
+\t\tcp -f liblinphone-sdk/android-arm64/lib/lib*.so libs/arm64-v8a && \\
 \t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs/arm64-v8a && \\
 \t\tsh WORK/android-arm64/strip.sh libs/arm64-v8a/*.so; \\
 \tfi
@@ -287,12 +281,10 @@ copy-libs:
 \trm -rf libs/x86
 \tif test -d "liblinphone-sdk/android-x86"; then \\
 \t\tmkdir -p libs-debug/x86 && \\
-\t\tcp -f liblinphone-sdk/android-x86/lib/libgnustl_shared.so libs-debug/x86 && \\
-\t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs-debug/x86 && \\
+\t\tcp -f liblinphone-sdk/android-x86/lib/lib*.so libs-debug/x86 && \\
 \t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs-debug/x86 && \\
 \t\tmkdir -p libs/x86 && \\
-\t\tcp -f liblinphone-sdk/android-x86/lib/libgnustl_shared.so libs/x86 && \\
-\t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs/x86 && \\
+\t\tcp -f liblinphone-sdk/android-x86/lib/lib*.so libs/x86 && \\
 \t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86 && \\
 \t\tsh WORK/android-x86/strip.sh libs/x86/*.so; \\
 \tfi
diff --git a/src/android/org/linphone/LinphoneService.java b/src/android/org/linphone/LinphoneService.java
index fce042048..eed0885c3 100644
--- a/src/android/org/linphone/LinphoneService.java
+++ b/src/android/org/linphone/LinphoneService.java
@@ -712,7 +712,6 @@ public final class LinphoneService extends Service {
 			sb.append(abi + ", ");
 		}
 		sb.append("\n");
-		sb.append("Used ABI=").append(LinphoneCoreFactoryImpl.ABI).append("\n");
 		Log.i(sb.toString());
 	}
 
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index a44a86a83..056695806 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit a44a86a83cc3271ff65d146534cd6e49c76fd38e
+Subproject commit 05669580605324014f3c23d5e466859ddbaa05e9
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index ae0cfb65e..59895c694 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit ae0cfb65e87120296adb3a386e0cc962f39bd775
+Subproject commit 59895c694fc02a4e86656b459040e9344f47af08
diff --git a/submodules/externals/build/ffmpeg/Android.mk b/submodules/externals/build/ffmpeg/Android.mk
deleted file mode 100755
index eeb813715..000000000
--- a/submodules/externals/build/ffmpeg/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libffmpeg-linphone
-LOCAL_MODULE_FILENAME := libffmpeg-linphone-$(TARGET_ARCH)
-LOCAL_SRC_FILES := $(TARGET_ARCH)/libffmpeg-linphone-$(TARGET_ARCH).so
-
-#turn off warnings since we cannot fix them
-LOCAL_CFLAGS += -w
-
-include $(PREBUILT_SHARED_LIBRARY)
diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg/Android_libavcodec.mk
deleted file mode 100755
index c8132269a..000000000
--- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libavcodec-linphone
-LOCAL_MODULE_FILENAME := libavcodec-linphone-$(TARGET_ARCH)
-LOCAL_SRC_FILES := $(TARGET_ARCH)/libavcodec/libavcodec-linphone-$(TARGET_ARCH).so
-
-include $(PREBUILT_SHARED_LIBRARY)
diff --git a/submodules/externals/build/ffmpeg/Android_libavutil.mk b/submodules/externals/build/ffmpeg/Android_libavutil.mk
deleted file mode 100755
index 76b998987..000000000
--- a/submodules/externals/build/ffmpeg/Android_libavutil.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libavutil-linphone
-LOCAL_MODULE_FILENAME := libavutil-linphone-$(TARGET_ARCH)
-LOCAL_SRC_FILES := $(TARGET_ARCH)/libavutil/libavutil-linphone-$(TARGET_ARCH).so
-
-include $(PREBUILT_SHARED_LIBRARY)
diff --git a/submodules/externals/build/ffmpeg/Android_libswscale.mk b/submodules/externals/build/ffmpeg/Android_libswscale.mk
deleted file mode 100755
index d8da6a8d4..000000000
--- a/submodules/externals/build/ffmpeg/Android_libswscale.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libswscale-linphone
-LOCAL_MODULE_FILENAME := libswscale-linphone-$(TARGET_ARCH)
-LOCAL_SRC_FILES := $(TARGET_ARCH)/libswscale/libswscale-linphone-$(TARGET_ARCH).so
-
-include $(PREBUILT_SHARED_LIBRARY)
diff --git a/submodules/externals/build/ffmpeg/CMakeLists.txt b/submodules/externals/build/ffmpeg/CMakeLists.txt
index 6cab7512c..dba4f1fc7 100644
--- a/submodules/externals/build/ffmpeg/CMakeLists.txt
+++ b/submodules/externals/build/ffmpeg/CMakeLists.txt
@@ -31,11 +31,11 @@ find_library(AVUTIL_LIBRARY avutil)
 find_library(SWRESAMPLE_LIBRARY swresample)
 find_library(SWSCALE_LIBRARY swscale)
 
-add_library(ffmpeg-linphone-${CMAKE_ANDROID_ARCH_ABI} SHARED)
-target_link_libraries(ffmpeg-linphone-${CMAKE_ANDROID_ARCH_ABI} LINK_PRIVATE "m" "-Wl,-whole-archive" ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWRESAMPLE_LIBRARY} ${SWSCALE_LIBRARY} "-Wl,-no-whole-archive")
-set_target_properties(ffmpeg-linphone-${CMAKE_ANDROID_ARCH_ABI} PROPERTIES LINKER_LANGUAGE C)
+add_library(ffmpeg-linphone SHARED)
+target_link_libraries(ffmpeg-linphone LINK_PRIVATE "m" "-Wl,-whole-archive" ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWRESAMPLE_LIBRARY} ${SWSCALE_LIBRARY} "-Wl,-no-whole-archive")
+set_target_properties(ffmpeg-linphone PROPERTIES LINKER_LANGUAGE C)
 
-install(TARGETS ffmpeg-linphone-${CMAKE_ANDROID_ARCH_ABI}
+install(TARGETS ffmpeg-linphone
 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/submodules/linphone b/submodules/linphone
index 5cde30dae..8633c5b8b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 5cde30dae7c034cb2f2fba0a367f16018e48de1e
+Subproject commit 8633c5b8b5f589e91cbb77ce82150247468d7477
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 399a95036..339889431 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 399a95036ef98862ced4af9df92c72ad1d8b6b8d
+Subproject commit 33988943131fce672e3bc5e247e5107f9bb2a587
diff --git a/submodules/oRTP b/submodules/oRTP
index f805b5c46..0c33151ce 160000
--- a/submodules/oRTP
+++ b/submodules/oRTP
@@ -1 +1 @@
-Subproject commit f805b5c465742d7895a9c9de03197e7216337bed
+Subproject commit 0c33151ce84d282670c45e7978f956d158c32a28