diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index fb37c64289eebcf039827d3c84473af66b27da3b..f1771f2759ff38c1d133e4526b0645cecc56f47e 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -260,8 +260,13 @@ cc_test {
     ],
     static_libs: [
         "android.hardware.bluetooth.a2dp@1.0",
+        "android.hardware.audio.common-V1-ndk",
+        "android.hardware.bluetooth.audio-V3-ndk",
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
+        "android.hardware.common-V2-ndk",
+        "android.hardware.common.fmq-V1-ndk",
+        "android.media.audio.common.types-V2-ndk",
         "android.system.suspend.control-V1-ndk",
         "libFraunhoferAAC",
         "libbluetooth-types",
@@ -295,7 +300,6 @@ cc_test {
     target: {
         android: {
             shared_libs: [
-                "android.hardware.bluetooth.audio-V3-ndk",
                 "libPlatformProperties",
                 "libbinder_ndk",
             ],
@@ -558,8 +562,14 @@ cc_test {
     cflags: ["-DBUILDCFG"],
     target: {
         android: {
-            shared_libs: [
+            static_libs: [
+                "android.hardware.audio.common-V1-ndk",
                 "android.hardware.bluetooth.audio-V3-ndk",
+                "android.hardware.common-V2-ndk",
+                "android.hardware.common.fmq-V1-ndk",
+                "android.media.audio.common.types-V2-ndk",
+            ],
+            shared_libs: [
                 "libbinder_ndk",
             ],
         },
@@ -683,8 +693,14 @@ cc_test {
     cflags: ["-DBUILDCFG"],
     target: {
         android: {
-            shared_libs: [
+            static_libs: [
+                "android.hardware.audio.common-V1-ndk",
                 "android.hardware.bluetooth.audio-V3-ndk",
+                "android.hardware.common-V2-ndk",
+                "android.hardware.common.fmq-V1-ndk",
+                "android.media.audio.common.types-V2-ndk",
+            ],
+            shared_libs: [
                 "libbinder_ndk",
             ],
         },
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index ffc4902dab6f6266863248114f1155c0ce7272b1..fb7eac267f0f520669a18ba2aaaa567fd18fa4c9 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -312,7 +312,6 @@ cc_test {
         "test/stack_avrcp_test.cc",
     ],
     shared_libs: [
-        "android.hardware.bluetooth.audio-V3-ndk",
         "android.hardware.bluetooth.audio@2.0",
         "android.hardware.bluetooth.audio@2.1",
         "libPlatformProperties",
@@ -330,8 +329,13 @@ cc_test {
     ],
     static_libs: [
         "android.hardware.bluetooth.a2dp@1.0",
+        "android.hardware.audio.common-V1-ndk",
+        "android.hardware.bluetooth.audio-V3-ndk",
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
+        "android.hardware.common-V2-ndk",
+        "android.hardware.common.fmq-V1-ndk",
+        "android.media.audio.common.types-V2-ndk",
         "android.system.suspend.control-V1-ndk",
         "libFraunhoferAAC",
         "libbluetooth-dumpsys",
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 4cb015234b7f6513fc9e71ddf2e197b03e6d757b..f448ffc1e2dc6c87ce986ffbde848003a866f51b 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -119,12 +119,14 @@ cc_test {
         "gatt/gatt_unittest.cc",
     ],
     static_libs: [
+        "android.hardware.audio.common-V1-ndk",
+        "android.hardware.bluetooth.audio-V3-ndk",
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
+        "android.hardware.common-V2-ndk",
+        "android.hardware.common.fmq-V1-ndk",
+        "android.media.audio.common.types-V2-ndk",
         "libchrome",
         "libevent",
     ],
-    shared_libs: [
-        "android.hardware.bluetooth.audio-V3-ndk",
-    ],
 }