release-request-fd631211-effa-4885-9314-559fcbd0a094-for-git_oc-mr1-release-4308825 snap-temp-L52700000098265170

Change-Id: Ie6b5dbe8c5a2b1393ced0f18ce4f91197453aac3
diff --git a/Android.bp b/Android.bp
index df2e2b9..ad834eb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2151,6 +2151,7 @@
         diag: {
             cfi: true,
         },
+        blacklist: "cfi_blacklist.txt",
     },
 }
 
diff --git a/Android.bp.in b/Android.bp.in
index a2c70e0..ac6a464 100644
--- a/Android.bp.in
+++ b/Android.bp.in
@@ -93,6 +93,7 @@
         diag: {
             cfi: true,
         },
+        blacklist: "cfi_blacklist.txt",
     },
 }
 
diff --git a/cfi_blacklist.txt b/cfi_blacklist.txt
new file mode 100644
index 0000000..1393ae4
--- /dev/null
+++ b/cfi_blacklist.txt
@@ -0,0 +1 @@
+src:*external/libvpx/*