Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE

Merged-In: I339cc3dfb18a6111c34a44250b19ad645aa05a9a
Change-Id: Ic13b3de3166697831a14fa27408705b477befbb9
diff --git a/Android.bp b/Android.bp
index 1db830f..bef9943 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,7 @@
 // a static library or otherwise statically link libexif with your code.
 cc_library_shared {
     name: "libexif",
+    host_supported: true,
     vendor_available: true,
     vndk: {
         enabled: true,
@@ -70,7 +71,7 @@
 
     sanitize: {
         integer_overflow: true,
-        blacklist: "libexif_blacklist.txt",
+        blocklist: "libexif_blocklist.txt",
     },
 }
 
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..6d8601b
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: RESTRICTED
+}
diff --git a/libexif_blacklist.txt b/libexif_blocklist.txt
similarity index 100%
rename from libexif_blacklist.txt
rename to libexif_blocklist.txt