Merge 2e5d5ed2a8632704a671c6ed3340d70ee8c714b2 on remote branch

Change-Id: Iec569467d3e74e003bd51a84c88c65fbb1972a3c
diff --git a/files/Android.bp b/files/Android.bp
index 30a5011..6ef6e8d 100644
--- a/files/Android.bp
+++ b/files/Android.bp
@@ -64,6 +64,12 @@
     shared_libs: ["libjpeg"],
 
     export_include_dirs: ["include"],
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media.swcodec",
+    ],
+    min_sdk_version: "29",
 }
 
 // compatibilty static library until all uses of libyuv_static are replaced
@@ -72,6 +78,11 @@
     name: "libyuv_static",
     vendor_available: true,
     whole_static_libs: ["libyuv"],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.media.swcodec",
+    ],
+    min_sdk_version: "29",
 }
 
 cc_test {