Merge 6de9f812fc7dcc92997236b59044ac3cd56e7e49 on remote branch

Change-Id: I24a119537e38e659030be487ac776d59e9ea75e0
diff --git a/Android.bp b/Android.bp
index 63f8f81..d47cb2b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -185,6 +185,10 @@
         },
     },
     min_sdk_version: "29",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media.swcodec",
+    ],
 }
 
 cc_defaults {