Snap for 6258215 from 7b9efb59d15fdd55dfa636578f10152c46ac32d6 to r-keystone-qcom-release

Change-Id: I199e7c15c00e3456b263abac3d4e14f16efd2936
diff --git a/Android.bp b/Android.bp
index 46f6d31..465dfbd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,8 +37,7 @@
         "com.android.art.release",
         "com.android.art.debug",
     ],
-    // Re-enable when b/145990493 is fixed
-    // sanitize: {
-    //     cfi: true,
-    // },
+    sanitize: {
+        cfi: true,
+    },
 }