Merge 35b68a4500ba3cbfc65875f4396bb6098c724778 on remote branch

Change-Id: Icef5cf85fc857e5c48d0a50af1dea1e2fdad8a88
diff --git a/Android.bp b/Android.bp
index a18bb8f..3ca94c0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,12 +2,14 @@
     name: "libFLAC-config",
     export_include_dirs: ["."],
     vendor_available: true,
+    min_sdk_version: "29",
 }
 
 cc_library_headers {
     name: "libFLAC-headers",
     export_include_dirs: ["include"],
     vendor_available: true,
+    min_sdk_version: "29",
 }
 
 subdirs = ["libFLAC"]
diff --git a/libFLAC/Android.bp b/libFLAC/Android.bp
index 1b9c7bd..4376ee2 100644
--- a/libFLAC/Android.bp
+++ b/libFLAC/Android.bp
@@ -57,4 +57,6 @@
         // cfi: true,
         blacklist: "libFLAC_blacklist.txt",
     },
+
+    min_sdk_version: "29",
 }