diff --git a/android/app/Android.bp b/android/app/Android.bp
index 248257dc7d8b8a20bee9b5a41fa8703d405182a5..095fbf037232b3e091968d19eea259905e8903d3 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -149,7 +149,6 @@ cc_library_shared {
         "server_configurable_flags",
     ],
     shared_libs: [
-        "libPlatformProperties",
         "libaaudio",
         "libbinder_ndk",
         "libcrypto",
diff --git a/system/audio_hal_interface/fuzzer/Android.bp b/system/audio_hal_interface/fuzzer/Android.bp
index a70a6f72da5d59d71b17ba1502d08f7f35fd9312..a3c3d4e7678b25d2d9ac5011cded02717fc2395d 100644
--- a/system/audio_hal_interface/fuzzer/Android.bp
+++ b/system/audio_hal_interface/fuzzer/Android.bp
@@ -88,7 +88,6 @@ cc_defaults {
         "libcgrouprc",
         "libcgrouprc_format",
         "libchrome",
-        "libcom.android.sysprop.bluetooth.wrapped",
         "libcutils",
         "libevent",
         "libg722codec",
diff --git a/system/gd/rust/topshim/facade/Android.bp b/system/gd/rust/topshim/facade/Android.bp
index 898f7408e770dd263a368aa1777cf7e2d0725b8e..bdbe1275b49f3795e2544165c8723e7e4f34dfc9 100644
--- a/system/gd/rust/topshim/facade/Android.bp
+++ b/system/gd/rust/topshim/facade/Android.bp
@@ -72,7 +72,6 @@ rust_defaults {
         "libbtif-core",
         "libc++fs",
         "libchrome",
-        "libcom.android.sysprop.bluetooth.wrapped",
         "libevent",
         "libflatbuffers-cpp",
         "libg722codec",
@@ -82,7 +81,6 @@ rust_defaults {
         "libudrv-uipc",
     ],
     shared_libs: [
-        "libPlatformProperties",
         "libcrypto",
         "libcutils",
         "libgrpc++",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 8393fa7b25805c3b3d9d3c6e390136e868cefa10..97288a3dd201964b77fcfa5ac92c0045e46bf18d 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -145,13 +145,13 @@ cc_library_static {
     ],
     whole_static_libs: [
         "libbluetooth_gd", // Gabeldorsche
-        "libcom.android.sysprop.bluetooth.wrapped",
     ],
     header_libs: ["libbluetooth_headers"],
     static_libs: [
         "libbluetooth_log",
         "libbt-platform-protos-lite",
         "libbt_shim_bridge",
+        "libcom.android.sysprop.bluetooth.wrapped",
     ],
 }
 
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 2dc14fd14b48c6ab61a3ab7e67c7fda9e2e35567..ae8e45b43100524ae9a89c4403abd8d53a672362 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -1675,7 +1675,6 @@ cc_test {
         "libosi",
     ],
     shared_libs: [
-        "libPlatformProperties",
         "libcrypto",
     ],
     sanitize: {
@@ -1739,7 +1738,6 @@ cc_test {
         "libprotobuf-cpp-lite",
     ],
     shared_libs: [
-        "libPlatformProperties",
         "libcrypto",
     ],
     target: {
diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp
index 3187d1ff573c34f57ab30fcb64ccc95fd29ac8fa..66e8ee08c7b1f8e12dacfc8559ddc645d6067b0e 100644
--- a/system/stack/test/fuzzers/Android.bp
+++ b/system/stack/test/fuzzers/Android.bp
@@ -60,7 +60,6 @@ cc_defaults {
         "libbte",
         "libbtif",
         "libbtif-core",
-        "libcom.android.sysprop.bluetooth.wrapped",
         "libg722codec",
         "liblc3",
         "libopus",
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index 9d21cb4634eaba3452fd7a8519f3ffe819dffb36..5903b4b960f674f01e2a02bb0833547021267e68 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -113,7 +113,6 @@ cc_binary {
         "libbtif-core",
         "libc++fs",
         "libchrome",
-        "libcom.android.sysprop.bluetooth.wrapped",
         "libevent",
         "libflatbuffers-cpp",
         "libfmq",