diff --git a/src/video_engine/main/test/android_test/jni/Android.mk b/src/video_engine/main/test/android_test/jni/Android.mk
index fef53de80..b56eabd5f 100644
--- a/src/video_engine/main/test/android_test/jni/Android.mk
+++ b/src/video_engine/main/test/android_test/jni/Android.mk
@@ -148,6 +148,12 @@ LOCAL_SRC_FILES := \
     $(MY_LIBS_PATH)/src/common_audio/libsignal_processing_neon.a
 include $(PREBUILT_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := libcommon_video
+LOCAL_SRC_FILES := \
+    $(MY_LIBS_PATH)/src/common_video/libcommon_video.a
+include $(PREBUILT_STATIC_LIBRARY)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := libsystem_wrappers
 LOCAL_SRC_FILES := \
@@ -202,12 +208,6 @@ LOCAL_SRC_FILES := \
     $(MY_LIBS_PATH)/src/modules/libaudio_conference_mixer.a
 include $(PREBUILT_STATIC_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := libwebrtc_libyuv
-LOCAL_SRC_FILES := \
-    $(MY_LIBS_PATH)/src/common_video/libwebrtc_libyuv.a
-include $(PREBUILT_STATIC_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := libyuv
 LOCAL_SRC_FILES := \
@@ -226,12 +226,6 @@ LOCAL_SRC_FILES := \
     $(MY_LIBS_PATH)/src/modules/video_coding/codecs/vp8/libwebrtc_vp8.a
 include $(PREBUILT_STATIC_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := libwebrtc_jpeg
-LOCAL_SRC_FILES := \
-    $(MY_LIBS_PATH)/src/common_video/libwebrtc_jpeg.a
-include $(PREBUILT_STATIC_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := libjpeg_turbo
 LOCAL_SRC_FILES := \
@@ -310,11 +304,10 @@ LOCAL_STATIC_LIBRARIES := \
     libudp_transport \
     libwebrtc_utility \
     libaudio_conference_mixer \
-    libwebrtc_libyuv \
+    libcommon_video \
     libyuv \
     libwebrtc_i420 \
     libwebrtc_vp8 \
-    libwebrtc_jpeg \
     libjpeg_turbo \
     libaudioproc_debug_proto \
     libprotobuf_lite \