diff --git a/AdvancedPrivacy/Advanced_Privacy-2.7.0-eos-release.apk b/AdvancedPrivacy/Advanced_Privacy-2.7.0-eos-release.apk
deleted file mode 100644
index acb6ac16af2f5285b4010f18223cb6a508f2a30c..0000000000000000000000000000000000000000
--- a/AdvancedPrivacy/Advanced_Privacy-2.7.0-eos-release.apk
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c39e3bfa553387dd1903db427af85043a620da7639cb33fa3d5df24385f2d50c
-size 178514653
diff --git a/AdvancedPrivacy/Advanced_Privacy-2.7.0-eos-releaseNoLibs.apk b/AdvancedPrivacy/Advanced_Privacy-2.7.0-eos-releaseNoLibs.apk
new file mode 100644
index 0000000000000000000000000000000000000000..b5b4f648ceebafe18fd4cdccc26d2c729d47c2ac
--- /dev/null
+++ b/AdvancedPrivacy/Advanced_Privacy-2.7.0-eos-releaseNoLibs.apk
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4ed3ea7b064cf8506b5ee8204c8d78c4f36eac37e9152a58ef6e0503f8b6cc9
+size 24051425
diff --git a/AdvancedPrivacy/Android.bp b/AdvancedPrivacy/Android.bp
index cecaba6daa21d2f90a4db37c204b5631fa93b8d3..cc664ce08cec2c1383a6969528c53dd6b7e996ce 100644
--- a/AdvancedPrivacy/Android.bp
+++ b/AdvancedPrivacy/Android.bp
@@ -11,13 +11,14 @@ android_app_import {
         "libtor",
         "libsentry",
         "libsentry-android",
+        "libdatastore_shared_counter",
     ],
 
     optional_uses_libs: [
         "androidx.window.extensions",
         "androidx.window.sidecar",
     ],
-    apk: "Advanced_Privacy-2.7.0-eos-release.apk",
+    apk: "Advanced_Privacy-2.7.0-eos-releaseNoLibs.apk",
 }
 
 prebuilt_etc {
@@ -35,50 +36,21 @@ cc_prebuilt_library_shared {
     target: {
         android_arm: {
             srcs: ["lib/armeabi-v7a/libgojni.so"],
-            required: ["libgojni_jni_symlink_arm"],
         },
         android_arm64: {
             srcs: ["lib/arm64-v8a/libgojni.so"],
-            required: ["libgojni_jni_symlink_arm64"],
         },
         android_x86: {
             srcs: ["lib/x86/libgojni.so"],
-            required: ["libgojni_jni_symlink_x86"],
         },
         android_x86_64: {
             srcs: ["lib/x86_64/libgojni.so"],
-            required: ["libgojni_jni_symlink_x86_64"],
         },
     },
     compile_multilib: "first",
     check_elf_files: false,
 }
 
-
-install_symlink {
-    name: "libgojni_jni_symlink_arm",
-    installed_location: "priv-app/AdvancedPrivacy/lib/arm/libgojni.so",
-    symlink_target: "/system/lib/libgojni.so",
-}
-
-install_symlink {
-    name: "libgojni_jni_symlink_arm64",
-    installed_location: "priv-app/AdvancedPrivacy/lib/arm64/libgojni.so",
-    symlink_target: "/system/lib64/libgojni.so",
-}
-
-install_symlink {
-    name: "libgojni_jni_symlink_x86",
-    installed_location: "priv-app/AdvancedPrivacy/lib/x86/libgojni.so",
-    symlink_target: "/system/lib/libgojni.so",
-}
-
-install_symlink {
-    name: "libgojni_jni_symlink_x86_64",
-    installed_location: "priv-app/AdvancedPrivacy/lib/x86_64/libgojni.so",
-    symlink_target: "/system/lib64/libgojni.so",
-}
-
 cc_prebuilt_library_shared {
     name: "libmapbox-gl",
     owner: "e",
@@ -88,49 +60,21 @@ cc_prebuilt_library_shared {
     target: {
         android_arm: {
             srcs: ["lib/armeabi-v7a/libmapbox-gl.so"],
-            required: ["libmapbox-gl_jni_symlink_arm"],
         },
         android_arm64: {
             srcs: ["lib/arm64-v8a/libmapbox-gl.so"],
-            required: ["libmapbox-gl_jni_symlink_arm64"],
         },
         android_x86: {
             srcs: ["lib/x86/libmapbox-gl.so"],
-            required: ["libmapbox-gl_jni_symlink_x86"],
         },
         android_x86_64: {
             srcs: ["lib/x86_64/libmapbox-gl.so"],
-            required: ["libmapbox-gl_jni_symlink_x86_64"],
         },
     },
     compile_multilib: "first",
     check_elf_files: false,
 }
 
-install_symlink {
-    name: "libmapbox-gl_jni_symlink_arm",
-    installed_location: "priv-app/AdvancedPrivacy/lib/arm/libmapbox-gl.so",
-    symlink_target: "/system/lib/libmapbox-gl.so",
-}
-
-install_symlink {
-    name: "libmapbox-gl_jni_symlink_arm64",
-    installed_location: "priv-app/AdvancedPrivacy/lib/arm64/libmapbox-gl.so",
-    symlink_target: "/system/lib64/libmapbox-gl.so",
-}
-
-install_symlink {
-    name: "libmapbox-gl_jni_symlink_x86",
-    installed_location: "priv-app/AdvancedPrivacy/lib/x86/libmapbox-gl.so",
-    symlink_target: "/system/lib/libmapbox-gl.so",
-}
-
-install_symlink {
-    name: "libmapbox-gl_jni_symlink_x86_64",
-    installed_location: "priv-app/AdvancedPrivacy/lib/x86_64/libmapbox-gl.so",
-    symlink_target: "/system/lib64/libmapbox-gl.so",
-}
-
 cc_prebuilt_library_shared {
     name: "libtor",
     owner: "e",
@@ -140,49 +84,21 @@ cc_prebuilt_library_shared {
     target: {
         android_arm: {
             srcs: ["lib/armeabi-v7a/libtor.so"],
-            required: ["libtor_jni_symlink_arm"],
         },
         android_arm64: {
             srcs: ["lib/arm64-v8a/libtor.so"],
-            required: ["libtor_jni_symlink_arm64"],
         },
         android_x86: {
             srcs: ["lib/x86/libtor.so"],
-            required: ["libtor_jni_symlink_x86"],
         },
         android_x86_64: {
             srcs: ["lib/x86_64/libtor.so"],
-            required: ["libtor_jni_symlink_x86_64"],
         },
     },
     compile_multilib: "first",
     check_elf_files: false,
 }
 
-install_symlink {
-    name: "libtor_jni_symlink_arm",
-    installed_location: "priv-app/AdvancedPrivacy/lib/arm/libtor.so",
-    symlink_target: "/system/lib/libtor.so",
-}
-
-install_symlink {
-    name: "libtor_jni_symlink_arm64",
-    installed_location: "priv-app/AdvancedPrivacy/lib/arm64/libtor.so",
-    symlink_target: "/system/lib64/libtor.so",
-}
-
-install_symlink {
-    name: "libtor_jni_symlink_x86",
-    installed_location: "priv-app/AdvancedPrivacy/lib/x86/libtor.so",
-    symlink_target: "/system/lib/libtor.so",
-}
-
-install_symlink {
-    name: "libtor_jni_symlink_x86_64",
-    installed_location: "priv-app/AdvancedPrivacy/lib/x86_64/libtor.so",
-    symlink_target: "/system/lib64/libtor.so",
-}
-
 cc_prebuilt_library_shared {
     name: "libsentry",
     owner: "e",
@@ -192,49 +108,21 @@ cc_prebuilt_library_shared {
     target: {
         android_arm: {
             srcs: ["lib/armeabi-v7a/libsentry.so"],
-            required: ["libsentry_jni_symlink_arm"],
         },
         android_arm64: {
             srcs: ["lib/arm64-v8a/libsentry.so"],
-            required: ["libsentry_jni_symlink_arm64"],
         },
         android_x86: {
             srcs: ["lib/x86/libsentry.so"],
-            required: ["libsentry_jni_symlink_x86"],
         },
         android_x86_64: {
             srcs: ["lib/x86_64/libsentry.so"],
-            required: ["libsentry_jni_symlink_x86_64"],
         },
     },
     compile_multilib: "first",
     check_elf_files: false,
 }
 
-install_symlink {
-    name: "libsentry_jni_symlink_arm",
-    installed_location: "priv-app/AdvancedPrivacy/lib/arm/libsentry.so",
-    symlink_target: "/system/lib/libsentry.so",
-}
-
-install_symlink {
-    name: "libsentry_jni_symlink_arm64",
-    installed_location: "priv-app/AdvancedPrivacy/lib/arm64/libsentry.so",
-    symlink_target: "/system/lib64/libsentry.so",
-}
-
-install_symlink {
-    name: "libsentry_jni_symlink_x86",
-    installed_location: "priv-app/AdvancedPrivacy/lib/x86/libsentry.so",
-    symlink_target: "/system/lib/libsentry.so",
-}
-
-install_symlink {
-    name: "libsentry_jni_symlink_x86_64",
-    installed_location: "priv-app/AdvancedPrivacy/lib/x86_64/libsentry.so",
-    symlink_target: "/system/lib64/libsentry.so",
-}
-
 cc_prebuilt_library_shared {
     name: "libsentry-android",
     owner: "e",
@@ -244,45 +132,42 @@ cc_prebuilt_library_shared {
     target: {
         android_arm: {
             srcs: ["lib/armeabi-v7a/libsentry-android.so"],
-            required: ["libsentry-android_jni_symlink_arm"],
         },
         android_arm64: {
             srcs: ["lib/arm64-v8a/libsentry-android.so"],
-            required: ["libsentry-android_jni_symlink_arm64"],
         },
         android_x86: {
             srcs: ["lib/x86/libsentry-android.so"],
-            required: ["libsentry-android_jni_symlink_x86"],
         },
         android_x86_64: {
             srcs: ["lib/x86_64/libsentry-android.so"],
-            required: ["libsentry-android_jni_symlink_x86_64"],
         },
     },
     compile_multilib: "first",
     check_elf_files: false,
 }
 
-install_symlink {
-    name: "libsentry-android_jni_symlink_arm",
-    installed_location: "priv-app/AdvancedPrivacy/lib/arm/libsentry-android.so",
-    symlink_target: "/system/lib/libsentry-android.so",
-}
-
-install_symlink {
-    name: "libsentry-android_jni_symlink_arm64",
-    installed_location: "priv-app/AdvancedPrivacy/lib/arm64/libsentry-android.so",
-    symlink_target: "/system/lib64/libsentry-android.so",
-}
-
-install_symlink {
-    name: "libsentry-android_jni_symlink_x86",
-    installed_location: "priv-app/AdvancedPrivacy/lib/x86/libsentry-android.so",
-    symlink_target: "/system/lib/libsentry-android.so",
+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,
 }
 
-install_symlink {
-    name: "libsentry-android_jni_symlink_x86_64",
-    installed_location: "priv-app/AdvancedPrivacy/lib/x86_64/libsentry-android.so",
-    symlink_target: "/system/lib64/libsentry-android.so",
-}
diff --git a/AdvancedPrivacy/lib/arm64-v8a/libdatastore_shared_counter.so b/AdvancedPrivacy/lib/arm64-v8a/libdatastore_shared_counter.so
new file mode 100644
index 0000000000000000000000000000000000000000..64056389fa2c9c69ded3353596a444afb29d6148
Binary files /dev/null and b/AdvancedPrivacy/lib/arm64-v8a/libdatastore_shared_counter.so differ
diff --git a/AdvancedPrivacy/lib/armeabi-v7a/libdatastore_shared_counter.so b/AdvancedPrivacy/lib/armeabi-v7a/libdatastore_shared_counter.so
new file mode 100644
index 0000000000000000000000000000000000000000..1d1833c9cb3a76b53de9a9d10700de2a52c5c842
Binary files /dev/null and b/AdvancedPrivacy/lib/armeabi-v7a/libdatastore_shared_counter.so differ
diff --git a/AdvancedPrivacy/lib/x86/libdatastore_shared_counter.so b/AdvancedPrivacy/lib/x86/libdatastore_shared_counter.so
new file mode 100644
index 0000000000000000000000000000000000000000..af34fdd233d3517000e30ed0dfafe985bcb1b142
Binary files /dev/null and b/AdvancedPrivacy/lib/x86/libdatastore_shared_counter.so differ
diff --git a/AdvancedPrivacy/lib/x86_64/libdatastore_shared_counter.so b/AdvancedPrivacy/lib/x86_64/libdatastore_shared_counter.so
new file mode 100644
index 0000000000000000000000000000000000000000..7490ad30c8faa0ade75873216f8479963533f36c
Binary files /dev/null and b/AdvancedPrivacy/lib/x86_64/libdatastore_shared_counter.so differ