diff --git a/AdvancedPrivacy/Advanced_Privacy-2.9.0-eos-releaseNoLibs.apk b/AdvancedPrivacy/Advanced_Privacy-2.9.0-eos-releaseNoLibs.apk
deleted file mode 100644
index 6e04d6dfb5874fe09eaf416263c68c468f2b9d25..0000000000000000000000000000000000000000
--- a/AdvancedPrivacy/Advanced_Privacy-2.9.0-eos-releaseNoLibs.apk
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2da85352c06f2325618dbbc070b2ecba3678a1302cf151bc9d2565fc5030c3c1
-size 24078727
diff --git a/AdvancedPrivacy/Android.bp b/AdvancedPrivacy/Android.bp
index f807fa8e5173f1841e620aab116b84e9e3a0117d..75f9721d4baeb6cfcee7d1bdd63e9a08e2a03175 100644
--- a/AdvancedPrivacy/Android.bp
+++ b/AdvancedPrivacy/Android.bp
@@ -6,168 +6,31 @@ android_app_import {
 
     required: [
         "privapp-permissions-foundation.e.advancedprivacy.xml",
-        "libgojni",
-        "libmaplibre",
-        "libtor",
-        "libsentry",
-        "libsentry-android",
-        "libdatastore_shared_counter",
     ],
 
     optional_uses_libs: [
         "androidx.window.extensions",
         "androidx.window.sidecar",
     ],
-    apk: "Advanced_Privacy-2.9.0-eos-releaseNoLibs.apk",
-}
-
-prebuilt_etc {
-    name: "privapp-permissions-foundation.e.advancedprivacy.xml",
-    src: "privapp-permissions-foundation.e.advancedprivacy.xml",
-    relative_install_path: "permissions",
-}
-
-cc_prebuilt_library_shared {
-    name: "libgojni",
-    owner: "e",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: ["lib/armeabi-v7a/libgojni.so"],
-        },
-        android_arm64: {
-            srcs: ["lib/arm64-v8a/libgojni.so"],
-        },
-        android_x86: {
-            srcs: ["lib/x86/libgojni.so"],
-        },
-        android_x86_64: {
-            srcs: ["lib/x86_64/libgojni.so"],
-        },
-    },
-    compile_multilib: "first",
-    check_elf_files: false,
-}
-
-cc_prebuilt_library_shared {
-    name: "libmapmibre",
-    owner: "e",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: ["lib/armeabi-v7a/libmaplibre.so"],
+     arch: {
+        arm: {
+            apk: "Advanced_Privacy-2.9.0-eos-armeabi-v7a-release.apk",
         },
-        android_arm64: {
-            srcs: ["lib/arm64-v8a/libmaplibre.so"],
+        arm64: {
+            apk: "Advanced_Privacy-2.9.0-eos-arm64-v8a-release.apk",
         },
-        android_x86: {
-            srcs: ["lib/x86/libmaplibre.so"],
+        x86: {
+            apk: "Advanced_Privacy-2.9.0-eos-x86-release.apk",
         },
-        android_x86_64: {
-            srcs: ["lib/x86_64/libmaplibre.so"],
+        x86_64: {
+            apk: "Advanced_Privacy-2.9.0-eos-x86_64-release.apk",
         },
     },
-    compile_multilib: "first",
-    check_elf_files: false,
 }
 
-cc_prebuilt_library_shared {
-    name: "libtor",
-    owner: "e",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: ["lib/armeabi-v7a/libtor.so"],
-        },
-        android_arm64: {
-            srcs: ["lib/arm64-v8a/libtor.so"],
-        },
-        android_x86: {
-            srcs: ["lib/x86/libtor.so"],
-        },
-        android_x86_64: {
-            srcs: ["lib/x86_64/libtor.so"],
-        },
-    },
-    compile_multilib: "first",
-    check_elf_files: false,
-}
-
-cc_prebuilt_library_shared {
-    name: "libsentry",
-    owner: "e",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: ["lib/armeabi-v7a/libsentry.so"],
-        },
-        android_arm64: {
-            srcs: ["lib/arm64-v8a/libsentry.so"],
-        },
-        android_x86: {
-            srcs: ["lib/x86/libsentry.so"],
-        },
-        android_x86_64: {
-            srcs: ["lib/x86_64/libsentry.so"],
-        },
-    },
-    compile_multilib: "first",
-    check_elf_files: false,
-}
-
-cc_prebuilt_library_shared {
-    name: "libsentry-android",
-    owner: "e",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: ["lib/armeabi-v7a/libsentry-android.so"],
-        },
-        android_arm64: {
-            srcs: ["lib/arm64-v8a/libsentry-android.so"],
-        },
-        android_x86: {
-            srcs: ["lib/x86/libsentry-android.so"],
-        },
-        android_x86_64: {
-            srcs: ["lib/x86_64/libsentry-android.so"],
-        },
-    },
-    compile_multilib: "first",
-    check_elf_files: false,
-}
-
-cc_prebuilt_library_shared {
-    name: "libdatastore_shared_counter",
-    owner: "e",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: ["lib/armeabi-v7a/libdatastore_shared_counter.so"],
-        },
-        android_arm64: {
-            srcs: ["lib/arm64-v8a/libdatastore_shared_counter.so"],
-        },
-        android_x86: {
-            srcs: ["lib/x86/libdatastore_shared_counter.so"],
-        },
-        android_x86_64: {
-            srcs: ["lib/x86_64/libdatastore_shared_counter.so"],
-        },
-    },
-    compile_multilib: "first",
-    check_elf_files: false,
+prebuilt_etc {
+    name: "privapp-permissions-foundation.e.advancedprivacy.xml",
+    src: "privapp-permissions-foundation.e.advancedprivacy.xml",
+    relative_install_path: "permissions",
 }
 
diff --git a/AdvancedPrivacy/lib/arm64-v8a/libdatastore_shared_counter.so b/AdvancedPrivacy/lib/arm64-v8a/libdatastore_shared_counter.so
deleted file mode 100644
index 64056389fa2c9c69ded3353596a444afb29d6148..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/arm64-v8a/libdatastore_shared_counter.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/arm64-v8a/libgojni.so b/AdvancedPrivacy/lib/arm64-v8a/libgojni.so
deleted file mode 100644
index e13304d46acbc0f0a4ddfda168061dd3c93b8f82..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/arm64-v8a/libgojni.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/arm64-v8a/libmaplibre.so b/AdvancedPrivacy/lib/arm64-v8a/libmaplibre.so
deleted file mode 100644
index 267faba7f09ea7b79ebfffbf819119bff86a7269..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/arm64-v8a/libmaplibre.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/arm64-v8a/libsentry-android.so b/AdvancedPrivacy/lib/arm64-v8a/libsentry-android.so
deleted file mode 100644
index 2c49b669c9b4916dac3015dbdcb2203df2039400..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/arm64-v8a/libsentry-android.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/arm64-v8a/libsentry.so b/AdvancedPrivacy/lib/arm64-v8a/libsentry.so
deleted file mode 100644
index 48ced9613825b5967a3e2b2f911e6bdf537725f4..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/arm64-v8a/libsentry.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/arm64-v8a/libtor.so b/AdvancedPrivacy/lib/arm64-v8a/libtor.so
deleted file mode 100644
index 0059adaa86dcf3706bc5ba1801c9dc7446ae5c37..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/arm64-v8a/libtor.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/armeabi-v7a/libdatastore_shared_counter.so b/AdvancedPrivacy/lib/armeabi-v7a/libdatastore_shared_counter.so
deleted file mode 100644
index 1d1833c9cb3a76b53de9a9d10700de2a52c5c842..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/armeabi-v7a/libdatastore_shared_counter.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/armeabi-v7a/libgojni.so b/AdvancedPrivacy/lib/armeabi-v7a/libgojni.so
deleted file mode 100644
index 1fd68ee75084a0068c57d5db2263963cbc2a5258..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/armeabi-v7a/libgojni.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/armeabi-v7a/libmaplibre.so b/AdvancedPrivacy/lib/armeabi-v7a/libmaplibre.so
deleted file mode 100644
index c76ab3f21872f30685a23770ff9437abea967c2e..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/armeabi-v7a/libmaplibre.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/armeabi-v7a/libsentry-android.so b/AdvancedPrivacy/lib/armeabi-v7a/libsentry-android.so
deleted file mode 100644
index 470f91f5c6c264741d0035cf4400e758a1734d7c..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/armeabi-v7a/libsentry-android.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/armeabi-v7a/libsentry.so b/AdvancedPrivacy/lib/armeabi-v7a/libsentry.so
deleted file mode 100644
index b5f486ccf93c5e32e9cc742f8bbf93607f114898..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/armeabi-v7a/libsentry.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/armeabi-v7a/libtor.so b/AdvancedPrivacy/lib/armeabi-v7a/libtor.so
deleted file mode 100644
index ec77c7ac8499b3650a23df947c8f426f73e20177..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/armeabi-v7a/libtor.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86/libdatastore_shared_counter.so b/AdvancedPrivacy/lib/x86/libdatastore_shared_counter.so
deleted file mode 100644
index af34fdd233d3517000e30ed0dfafe985bcb1b142..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86/libdatastore_shared_counter.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86/libgojni.so b/AdvancedPrivacy/lib/x86/libgojni.so
deleted file mode 100644
index 2fe6b369de3f383a1f4e86d1a7eea93bbcddbf6c..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86/libgojni.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86/libmaplibre.so b/AdvancedPrivacy/lib/x86/libmaplibre.so
deleted file mode 100644
index 60a00fd4be448d3041402d739e4d0a4bfeb6d4a3..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86/libmaplibre.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86/libsentry-android.so b/AdvancedPrivacy/lib/x86/libsentry-android.so
deleted file mode 100644
index 7d11b0bacb6ec9204db8ec3f5ad99cbd8d247c1e..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86/libsentry-android.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86/libsentry.so b/AdvancedPrivacy/lib/x86/libsentry.so
deleted file mode 100644
index aa61facfa36d44b6db05a69756b29a1c647d687e..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86/libsentry.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86/libtor.so b/AdvancedPrivacy/lib/x86/libtor.so
deleted file mode 100644
index 948680dcedbc2ac01e520f75d4d6f62d30e863b7..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86/libtor.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86_64/libdatastore_shared_counter.so b/AdvancedPrivacy/lib/x86_64/libdatastore_shared_counter.so
deleted file mode 100644
index 7490ad30c8faa0ade75873216f8479963533f36c..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86_64/libdatastore_shared_counter.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86_64/libgojni.so b/AdvancedPrivacy/lib/x86_64/libgojni.so
deleted file mode 100644
index 70597752ca77ba081718aa872b053d515a6e9191..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86_64/libgojni.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86_64/libmaplibre.so b/AdvancedPrivacy/lib/x86_64/libmaplibre.so
deleted file mode 100644
index 707e258e7b8ffdb20c14996a540016c3c5fe56c4..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86_64/libmaplibre.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86_64/libsentry-android.so b/AdvancedPrivacy/lib/x86_64/libsentry-android.so
deleted file mode 100644
index ae20194e83c079d2fa6f7f53018a0061444306c1..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86_64/libsentry-android.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86_64/libsentry.so b/AdvancedPrivacy/lib/x86_64/libsentry.so
deleted file mode 100644
index da31490ea1987d329fc3fb9b3456592ee33bb889..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86_64/libsentry.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/x86_64/libtor.so b/AdvancedPrivacy/lib/x86_64/libtor.so
deleted file mode 100644
index 558ffba220bf80c2c7f98ee9b5b76432b39a63c9..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/x86_64/libtor.so and /dev/null differ