Merge 1813151fed9a548d0028b254f37c0026814feca3 on remote branch

Change-Id: I95447f3c7c0e19742a233248fd906a208b5cb062
diff --git a/Android.bp b/Android.bp
index af7b348..71406d8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,6 +59,13 @@
         },
     },
     min_sdk_version: "29",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media",
+        "com.android.media.swcodec",
+        "test_com.android.media.swcodec",
+    ],
+
 }
 
 cc_library_headers {
@@ -72,6 +79,13 @@
         },
     },
     min_sdk_version: "29",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media",
+        "com.android.media.swcodec",
+        "test_com.android.media.swcodec",
+    ],
+
 }
 
 subdirs = ["src/libFLAC"]
diff --git a/src/libFLAC/Android.bp b/src/libFLAC/Android.bp
index 3d32da2..a08fae0 100644
--- a/src/libFLAC/Android.bp
+++ b/src/libFLAC/Android.bp
@@ -75,4 +75,11 @@
         },
     },
     min_sdk_version: "29",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media",
+        "com.android.media.swcodec",
+        "test_com.android.media.swcodec",
+    ],
+
 }