diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index 2a1e56c..d7e9461 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -118,14 +118,14 @@
     export_header_lib_headers: ["libaudioclient_headers"],
     export_static_lib_headers: [
         "effect-aidl-cpp",
-        "shared-file-region-aidl-cpp",
+        "shared-file-region-aidl-unstable-cpp",
     ],
 
     static_libs: [
         "effect-aidl-cpp",
         // for memory heap analysis
         "libc_malloc_debug_backtrace",
-        "shared-file-region-aidl-cpp",
+        "shared-file-region-aidl-unstable-cpp",
     ],
     cflags: [
         "-Wall",
diff --git a/media/libshmem/Android.bp b/media/libshmem/Android.bp
index ee33f9e..fae98ed 100644
--- a/media/libshmem/Android.bp
+++ b/media/libshmem/Android.bp
@@ -15,12 +15,12 @@
         "libbinder",
         "libshmemutil",
         "libutils",
-        "shared-file-region-aidl-cpp",
+        "shared-file-region-aidl-unstable-cpp",
     ],
     export_shared_lib_headers: [
         "libbinder",
         "libutils",
-        "shared-file-region-aidl-cpp",
+        "shared-file-region-aidl-unstable-cpp",
     ],
 }
 
@@ -29,10 +29,10 @@
     export_include_dirs: ["include"],
     srcs: ["ShmemUtil.cpp"],
     shared_libs: [
-        "shared-file-region-aidl-cpp",
+        "shared-file-region-aidl-unstable-cpp",
     ],
     export_shared_lib_headers: [
-        "shared-file-region-aidl-cpp",
+        "shared-file-region-aidl-unstable-cpp",
     ],
 }
 
@@ -44,7 +44,7 @@
         "libshmemcompat",
         "libshmemutil",
         "libutils",
-        "shared-file-region-aidl-cpp",
+        "shared-file-region-aidl-unstable-cpp",
     ],
     test_suites: ["device-tests"],
 }