Merge QP1A.190212.003

Change-Id: If90c3aff99b030ac7601465e45f6400637eada8a
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..013abf5
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,5 @@
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+hunga@google.com
+ivanlozano@google.com
+robertshih@google.com
diff --git a/libFLAC/Android.bp b/libFLAC/Android.bp
index 4d1dc8d..1ad522b 100644
--- a/libFLAC/Android.bp
+++ b/libFLAC/Android.bp
@@ -53,11 +53,11 @@
     sanitize: {
         integer_overflow: true,
         misc_undefined: ["bounds"],
-        cfi: true,
+        // Enable CFI if this is used as a shared library
+        // cfi: true,
         diag: {
             integer_overflow: true,
             misc_undefined: ["bounds"],
-            cfi: true,
             no_recover: ["bounds", "integer"],
         },
         blacklist: "libFLAC_blacklist.txt",