Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903

Bug: 166295507
Merged-In: I727f2d7476b85df3c133cfed15cc2d4d381b69ff
Change-Id: I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f

1 files changed, 3 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index b753a8c..56de86c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -36,4 +36,7 @@ cc_library_shared {
     apex_available: [
         "com.android.i18n",
     ],
+    sanitize: {
+        cfi: true,
+    },
 }