Merge "Turn off CFI for the Keymaster VTS" am: 1ff635ab2d am: ab78c4b682

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1906291

Change-Id: If792d8c254971518aff431760585707d5a860851
diff --git a/keymaster/4.0/vts/functional/Android.bp b/keymaster/4.0/vts/functional/Android.bp
index a7be660..8e5a0ff 100644
--- a/keymaster/4.0/vts/functional/Android.bp
+++ b/keymaster/4.0/vts/functional/Android.bp
@@ -41,6 +41,10 @@
         "general-tests",
         "vts",
     ],
+    sanitize: {
+        cfi: false,
+    },
+
 }
 
 cc_test_library {