diff --git a/project/jni/application/supertux/AndroidAppSettings.cfg b/project/jni/application/supertux/AndroidAppSettings.cfg
index c9cfc7a07..2e4bc5995 100644
--- a/project/jni/application/supertux/AndroidAppSettings.cfg
+++ b/project/jni/application/supertux/AndroidAppSettings.cfg
@@ -252,7 +252,7 @@ APP_PLATFORM=
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a
-MultiABI='armeabi-v7a' # x86 x86_64 arm64-v8a'
+MultiABI='armeabi-v7a x86 x86_64 arm64-v8a'
 
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed
diff --git a/project/jni/application/supertux/AndroidPreBuild.sh b/project/jni/application/supertux/AndroidPreBuild.sh
deleted file mode 100755
index ea0376051..000000000
--- a/project/jni/application/supertux/AndroidPreBuild.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Reduce .apk file size, at the expense of overlay key themes
-cp -f ../../../res/raw/ultimatedroid.raw ../../../res/raw/dualshock.raw
-cp -f ../../../res/raw/ultimatedroid.raw ../../../res/raw/n64.raw
-cp -f ../../../res/raw/ultimatedroid.raw ../../../res/raw/sun.raw
diff --git a/project/jni/application/supertux/create-apk-bundle.sh b/project/jni/application/supertux/create-apk-bundle.sh
new file mode 100755
index 000000000..8f3fcec33
--- /dev/null
+++ b/project/jni/application/supertux/create-apk-bundle.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+OUT=`pwd`/../../../../SuperTux-with-data.apk
+rm -f $OUT $OUT-aligned
+cp ../../../../project/app/build/outputs/apk/app-release.apk $OUT || exit 1
+cd supertux/data || exit 1
+zip -r -9 $OUT * || exit 1
+zipalign 4 $OUT $OUT-aligned || exit 1
+apksigner sign --ks ~/.android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android $OUT-aligned || exit 1
+mv $OUT-aligned $OUT
diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux
index 3cf41ed83..4244349c5 160000
--- a/project/jni/application/supertux/supertux
+++ b/project/jni/application/supertux/supertux
@@ -1 +1 @@
-Subproject commit 3cf41ed832fcc64f15069f2f7fb4a0220f05c502
+Subproject commit 4244349c56da0707e636b687d1e7c545d4bd22e2