diff --git a/project/jni/application/openarena/AndroidBuild.sh b/project/jni/application/openarena/AndroidBuild.sh
index 5eed61270..18255f993 100755
--- a/project/jni/application/openarena/AndroidBuild.sh
+++ b/project/jni/application/openarena/AndroidBuild.sh
@@ -16,7 +16,8 @@ zip ../../AndroidData/vm.zip *
 
 env NO_SHARED_LIBS=1 BUILD_EXECUTABLE=1 V=1 ../setEnvironment-armeabi.sh make -C vm -j8 PLATFORM=android ARCH=$1 USE_LOCAL_HEADERS=0 BUILD_MISSIONPACK=0 || exit 1
 
-../setEnvironment-armeabi.sh sh -c "cd vm/build/release-android-$1/baseq3 && \$STRIP --strip-unneeded *.so && zip ../../../../AndroidData/binaries.zip *.so"
+# Do not generate shared game logic libs - QVM files are used instead
+# ../setEnvironment-armeabi.sh sh -c "cd vm/build/release-android-$1/baseq3 && \$STRIP --strip-unneeded *.so && zip ../../../../AndroidData/binaries.zip *.so"
 
 ../setEnvironment-$1.sh make -j8 -C engine release \
 PLATFORM=android ARCH=$1 USE_GLES=1 USE_LOCAL_HEADERS=0 \
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 78a8d6975..9516f19bb 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 78a8d6975ac8a0acea9edc87ec0c10d89a2e9827
+Subproject commit 9516f19bb23d0f563de0c2c936fd703d5d7e8c4d
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index c5877216b..6f21ee080 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit c5877216b00201e6489de117e77e7feaad08ce9b
+Subproject commit 6f21ee080cd56a2262d04acbb7304740343593e1