Merge c712292e628976f4b874d430e12f52aea8723547 on remote branch

Change-Id: If598288e3b563c33c4924d57ed58d1f658aa1f74
diff --git a/Android.bp b/Android.bp
index 234a888..f612412 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,11 @@
     host_supported: true,
     hostdex: true,
     sdk_version: "core_current",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media",
+    ],
+    min_sdk_version: "14",
     srcs: ["ri/src/main/java/**/*.java"],
 }