diff --git a/Android.bp b/Android.bp
index 4df72bbc3..6c9ffdd1f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,6 +45,8 @@ android_app {
         "seedvault-lib-dav4jvm",
         "seedvault-lib-okhttp",
     ],
+    aapt_include_all_resources: true,
+    compile_multilib: "both",
     manifest: "app/src/main/AndroidManifest.xml",
 
     platform_apis: true,
diff --git a/libs/Android.bp b/libs/Android.bp
index 13cbd3900..36158313a 100644
--- a/libs/Android.bp
+++ b/libs/Android.bp
@@ -7,6 +7,7 @@ android_library_import {
     name: "seedvault-lib-zstd-jni",
     aars: ["zstd-jni-1.5.6-5.aar"],
     sdk_version: "current",
+    extract_jni: true,
 }
 
 java_import {