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.9.0-eos-releaseNoLibs.apk b/AdvancedPrivacy/Advanced_Privacy-2.9.0-eos-releaseNoLibs.apk
new file mode 100644
index 0000000000000000000000000000000000000000..6e04d6dfb5874fe09eaf416263c68c468f2b9d25
--- /dev/null
+++ b/AdvancedPrivacy/Advanced_Privacy-2.9.0-eos-releaseNoLibs.apk
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2da85352c06f2325618dbbc070b2ecba3678a1302cf151bc9d2565fc5030c3c1
+size 24078727
diff --git a/AdvancedPrivacy/Android.bp b/AdvancedPrivacy/Android.bp
index cecaba6daa21d2f90a4db37c204b5631fa93b8d3..9c46218e148bc2e44beba6f9c90d27de323e6290 100644
--- a/AdvancedPrivacy/Android.bp
+++ b/AdvancedPrivacy/Android.bp
@@ -7,17 +7,18 @@ android_app_import {
     required: [
         "privapp-permissions-foundation.e.advancedprivacy.xml",
         "libgojni",
-        "libmapbox-gl",
+        "libmaplibre",
         "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.9.0-eos-releaseNoLibs.apk",
 }
 
 prebuilt_etc {
@@ -35,102 +36,45 @@ 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",
+    name: "libmaplibre",
     owner: "e",
     strip: {
         none: true,
     },
     target: {
         android_arm: {
-            srcs: ["lib/armeabi-v7a/libmapbox-gl.so"],
-            required: ["libmapbox-gl_jni_symlink_arm"],
+            srcs: ["lib/armeabi-v7a/libmaplibre.so"],
         },
         android_arm64: {
-            srcs: ["lib/arm64-v8a/libmapbox-gl.so"],
-            required: ["libmapbox-gl_jni_symlink_arm64"],
+            srcs: ["lib/arm64-v8a/libmaplibre.so"],
         },
         android_x86: {
-            srcs: ["lib/x86/libmapbox-gl.so"],
-            required: ["libmapbox-gl_jni_symlink_x86"],
+            srcs: ["lib/x86/libmaplibre.so"],
         },
         android_x86_64: {
-            srcs: ["lib/x86_64/libmapbox-gl.so"],
-            required: ["libmapbox-gl_jni_symlink_x86_64"],
+            srcs: ["lib/x86_64/libmaplibre.so"],
         },
     },
     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/arm64-v8a/libmapbox-gl.so b/AdvancedPrivacy/lib/arm64-v8a/libmaplibre.so
similarity index 52%
rename from AdvancedPrivacy/lib/arm64-v8a/libmapbox-gl.so
rename to AdvancedPrivacy/lib/arm64-v8a/libmaplibre.so
index 6f8865d7dead4d0b857cca12d31ebdda1e8fcabd..267faba7f09ea7b79ebfffbf819119bff86a7269 100644
Binary files a/AdvancedPrivacy/lib/arm64-v8a/libmapbox-gl.so and b/AdvancedPrivacy/lib/arm64-v8a/libmaplibre.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/armeabi-v7a/libmapbox-gl.so b/AdvancedPrivacy/lib/armeabi-v7a/libmapbox-gl.so
deleted file mode 100644
index 1fac2c63c5925f69e963544eacc25ca2ac78614f..0000000000000000000000000000000000000000
Binary files a/AdvancedPrivacy/lib/armeabi-v7a/libmapbox-gl.so and /dev/null differ
diff --git a/AdvancedPrivacy/lib/armeabi-v7a/libmaplibre.so b/AdvancedPrivacy/lib/armeabi-v7a/libmaplibre.so
new file mode 100644
index 0000000000000000000000000000000000000000..c76ab3f21872f30685a23770ff9437abea967c2e
Binary files /dev/null and b/AdvancedPrivacy/lib/armeabi-v7a/libmaplibre.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/libmapbox-gl.so b/AdvancedPrivacy/lib/x86/libmaplibre.so
similarity index 54%
rename from AdvancedPrivacy/lib/x86/libmapbox-gl.so
rename to AdvancedPrivacy/lib/x86/libmaplibre.so
index 4805a0f5c10150f92944e70c93b9b0d84c79b3c0..60a00fd4be448d3041402d739e4d0a4bfeb6d4a3 100644
Binary files a/AdvancedPrivacy/lib/x86/libmapbox-gl.so and b/AdvancedPrivacy/lib/x86/libmaplibre.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
diff --git a/AdvancedPrivacy/lib/x86_64/libmapbox-gl.so b/AdvancedPrivacy/lib/x86_64/libmaplibre.so
similarity index 54%
rename from AdvancedPrivacy/lib/x86_64/libmapbox-gl.so
rename to AdvancedPrivacy/lib/x86_64/libmaplibre.so
index 94a18a7c80ddb22581635cd120e2450c90f10a53..707e258e7b8ffdb20c14996a540016c3c5fe56c4 100644
Binary files a/AdvancedPrivacy/lib/x86_64/libmapbox-gl.so and b/AdvancedPrivacy/lib/x86_64/libmaplibre.so differ
diff --git a/FindMyDevice/Android.bp b/FindMyDevice/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..c2947335a9c234ec75c0342d1eeaa853eb80bc3e
--- /dev/null
+++ b/FindMyDevice/Android.bp
@@ -0,0 +1,7 @@
+android_app_import {
+    name: "FindMyDevice",
+    system_ext_specific: true,
+    certificate: "platform",
+    apk: "app-release.apk",
+}
+
diff --git a/FindMyDevice/app-release.apk b/FindMyDevice/app-release.apk
new file mode 100644
index 0000000000000000000000000000000000000000..5616e55a068e79d7912b9c9b5cca45706667dd76
--- /dev/null
+++ b/FindMyDevice/app-release.apk
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:120635246eb213d4678026b5fabac2505d066ff30168ce515ff533aab0534771
+size 34098914
diff --git a/Maps/Android.bp b/Maps/Android.bp
index c60130c8a0d0762964139f9af193742fa581c15a..1fc3c599b71469b46a2d9686c14785a408ed1fcc 100644
--- a/Maps/Android.bp
+++ b/Maps/Android.bp
@@ -4,7 +4,6 @@ android_app_import {
     preprocessed: true,
 
     required: [
-        "libMagicEarthSphereNative",
         "mapsOverlay",
     ],
 
@@ -29,55 +28,3 @@ android_app_import {
         },
     },
 }
-
-cc_prebuilt_library_shared {
-    name: "libMagicEarthSphereNative",
-    owner: "magicearth",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: ["lib/armeabi-v7a/libMagicEarthSphereNative.so"],
-            required: ["libMagicEarthSphereNative_jni_symlink_arm"],
-        },
-        android_arm64: {
-            srcs: ["lib/arm64-v8a/libMagicEarthSphereNative.so"],
-            required: ["libMagicEarthSphereNative_jni_symlink_arm64"],
-        },
-        android_x86: {
-            srcs: ["lib/x86/libMagicEarthSphereNative.so"],
-            required: ["libMagicEarthSphereNative_jni_symlink_x86"],
-        },
-        android_x86_64: {
-            srcs: ["lib/x86_64/libMagicEarthSphereNative.so"],
-            required: ["libMagicEarthSphereNative_jni_symlink_x86_64"],
-        },
-    },
-    compile_multilib: "first",
-    check_elf_files: false,
-}
-
-install_symlink {
-    name: "libMagicEarthSphereNative_jni_symlink_arm",
-    installed_location: "priv-app/MagicEarth/lib/arm/libMagicEarthSphereNative.so",
-    symlink_target: "/system/lib/libMagicEarthSphereNative.so",
-}
-
-install_symlink {
-    name: "libMagicEarthSphereNative_jni_symlink_arm64",
-    installed_location: "app/MagicEarth/lib/arm64/libMagicEarthSphereNative.so",
-    symlink_target: "/system/lib64/libMagicEarthSphereNative.so",
-}
-
-install_symlink {
-    name: "libMagicEarthSphereNative_jni_symlink_x86",
-    installed_location: "app/MagicEarth/lib/x86/libMagicEarthSphereNative.so",
-    symlink_target: "/system/lib/libMagicEarthSphereNative.so",
-}
-
-install_symlink {
-    name: "libMagicEarthSphereNative_jni_symlink_x86_64",
-    installed_location: "app/MagicEarth/lib/x86_64/libMagicEarthSphereNative.so",
-    symlink_target: "/system/lib64/libMagicEarthSphereNative.so",
-}
diff --git a/Maps/lib/arm64-v8a/libMagicEarthSphereNative.so b/Maps/lib/arm64-v8a/libMagicEarthSphereNative.so
deleted file mode 100644
index a23de6eee3bbe167edc1569c2b2f5cad931c2492..0000000000000000000000000000000000000000
Binary files a/Maps/lib/arm64-v8a/libMagicEarthSphereNative.so and /dev/null differ
diff --git a/Maps/lib/armeabi-v7a/libMagicEarthSphereNative.so b/Maps/lib/armeabi-v7a/libMagicEarthSphereNative.so
deleted file mode 100644
index 12fa807a84086d1519e969b16ecdf6be22076ba6..0000000000000000000000000000000000000000
Binary files a/Maps/lib/armeabi-v7a/libMagicEarthSphereNative.so and /dev/null differ
diff --git a/Maps/lib/x86/libMagicEarthSphereNative.so b/Maps/lib/x86/libMagicEarthSphereNative.so
deleted file mode 100644
index 5ac508b4cdc4b6f8d3efa224f7b68fe159fb10db..0000000000000000000000000000000000000000
Binary files a/Maps/lib/x86/libMagicEarthSphereNative.so and /dev/null differ
diff --git a/Maps/lib/x86_64/libMagicEarthSphereNative.so b/Maps/lib/x86_64/libMagicEarthSphereNative.so
deleted file mode 100644
index 22569c315f6d8406fbb1c3483f1ac6a9b5613ae6..0000000000000000000000000000000000000000
Binary files a/Maps/lib/x86_64/libMagicEarthSphereNative.so and /dev/null differ
diff --git a/ParentalControl/app-release.apk b/ParentalControl/app-release.apk
index 2f4da941e8c66c429c2bcbae8b3b95e9d5288d15..e6787de3c36f410622dfb992040cd3a962eedb50 100644
--- a/ParentalControl/app-release.apk
+++ b/ParentalControl/app-release.apk
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30d4e903bf5bf3dab7a1ff45a2515cce9dd27671565d703e37e390d676107a87
-size 3582654
+oid sha256:7af5b3bea5b2bace7c063e9c04bff316da2f257a62029e62d93cd7f004b61fe2
+size 27491526
diff --git a/SpeechToText/Android.bp b/SpeechToText/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..d642f418e3c8fbcc3903677d19c168abe7a7bb27
--- /dev/null
+++ b/SpeechToText/Android.bp
@@ -0,0 +1,7 @@
+android_app_import {
+    name: "SpeechToText",
+    system_ext_specific: true,
+    certificate: "platform",
+    apk: "app-release.apk",
+}
+
diff --git a/SpeechToText/app-release.apk b/SpeechToText/app-release.apk
new file mode 100644
index 0000000000000000000000000000000000000000..83cbed802fd276dea79afeaf13532106bbd2db39
--- /dev/null
+++ b/SpeechToText/app-release.apk
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee89f0571b5b3eab6a18ddfa2f14f951590ac9c01e9e74adb5a61c8d18d0ae2c
+size 28519794
diff --git a/config/common.mk b/config/common.mk
index c436a1e10ed1e882fb4b6c83bbbce4c306a6853f..5deb8352caf95ca9f2364d893bbed34f4891d874 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -34,9 +34,11 @@ PRODUCT_PACKAGES += \
     OpenKeychain \
     ParentalControl \
     PwaPlayer \
+    SpeechToText \
     Talkback \
     Tasks \
-    WebCalendarManager
+    WebCalendarManager \
+    FindMyDevice 
 
 # Optional applications
 MINIMAL_APPS ?= false