Snap for 8130893 from 724a46603b82f0f68e2af8fd4cf34d2326f3749d to tm-release

Change-Id: I348767c700c4511d9ea1be930455d1cb3a1d9a77
diff --git a/Android.bp b/Android.bp
index e76d66d..ecd4bb8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1191,6 +1191,10 @@
         blocklist: "libvpx_blocklist.txt",
     },
     min_sdk_version: "29",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media.swcodec",
+    ],
 }
 
 cc_fuzz {
diff --git a/Android.bp.in b/Android.bp.in
index 3d6fb28..1a3f7dd 100644
--- a/Android.bp.in
+++ b/Android.bp.in
@@ -96,6 +96,10 @@
         blocklist: "libvpx_blocklist.txt",
     },
     min_sdk_version: "29",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media.swcodec",
+    ],
 }
 
 cc_fuzz {
diff --git a/libwebm/Android.bp b/libwebm/Android.bp
index f33f16e..e6ebce0 100644
--- a/libwebm/Android.bp
+++ b/libwebm/Android.bp
@@ -20,6 +20,10 @@
         // cfi: true,
     },
     min_sdk_version: "29",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media",
+    ],
     host_supported: true,
     target: {
         darwin: {