Merge "Enable cfi for aac" am: 5690f9c39f

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1518238

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b4ff4c9a2e1ccd1139a37ac2a537467efee9583

Android.bp

@@ -32,8 +32,7 @@ cc_library_static {
             "signed-integer-overflow",
             "bounds",
         ],
-        // Enable CFI if this becomes a shared library.
-        // cfi: true,
+        cfi: true,
     },
     shared_libs: [
         "liblog",
@@ -58,6 +57,13 @@ cc_library_static {
         darwin: {
             enabled: false,
         },
+        android: {
+            sanitize: {
+                diag: {
+                    cfi: true,
+                },
+            },
+        },
     },
 
     apex_available: [