Merge "Set apex_available property"
diff --git a/Android.bp b/Android.bp
index 8d907b7..ed29f5b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,6 +75,10 @@
         "//apex_available:platform",
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
+        "com.android.bluetooth.updatable",
+        "com.android.media",
+        "com.android.media.swcodec",
+        "com.android.tethering",
     ],
     vndk: {
         enabled: true,
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index e6b6b50..3ba408f 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -23,6 +23,8 @@
         "//apex_available:platform",
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
+        "com.android.media",
+        "com.android.media.swcodec",
     ],
     defaults: ["libhidl-defaults"],
     shared_libs: [