Snap for 6530637 from 3d048b6a0ebe8e9220d44a093445899239fccd2c to mainline-release

Change-Id: I0ce0f7bb16e9f6aa7799092795ede0d356ba36c6
diff --git a/Android.bp b/Android.bp
index 3d47254..9ecbda7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,6 +23,10 @@
         "tree/library/common/src/main/java/**/*.java",
     ],
     sdk_version: "29", // Needs to be a prebuilt, so not "current".
+    apex_available: [
+        "com.android.media",
+    ],
+    min_sdk_version: "16", // match with tree/constants.gradle
     static_libs: [
         "exoplayer2-extractor-annotation-stubs",
         "androidx.annotation_annotation",
@@ -39,6 +43,10 @@
     name: "exoplayer2-extractor-annotation-stubs",
     host_supported: true,
     sdk_version: "core_current",
+    apex_available: [
+        "com.android.media",
+    ],
+    min_sdk_version: "16",
     srcs: ["annotation-stubs/src/**/*.java"],
     static_libs: ["jsr305"],
     visibility: ["//visibility:private"],