Merge a1e13115507e4f3f48d75581d806d1085bf3e52b on remote branch

Change-Id: Ibd516a25db9e041fd34e0d47aa61cb84493a60f9
diff --git a/Android.bp b/Android.bp
index a1468dd..8ed9dcd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,4 +83,10 @@
 
     export_include_dirs: ["inc"],
     min_sdk_version: "apex_inherit",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media.swcodec",
+        "test_com.android.media.swcodec",
+    ],
+
 }