Merge deabed12786e02e02f841d4b0bf7b22f8b6b3ab5 on remote branch

Change-Id: I4bf240ab0f0766d38e0bea427465335e51a9d84f
diff --git a/Android.bp b/Android.bp
index b233277..541d37c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,8 +48,8 @@
     hostdex: true,
     sdk_version: "core_current",
     apex_available: [
+        "//apex_available:anyapex",
         "//apex_available:platform",
-        "com.android.media",
     ],
     min_sdk_version: "14",
     srcs: ["ri/src/main/java/**/*.java"],