Merge "aac remove diag" am: f13c7a4054

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I228ca5c02b5284a17e96c2f09adc27848d364703

Android.bp

@@ -57,13 +57,6 @@ cc_library_static {
         darwin: {
             enabled: false,
         },
-        android: {
-            sanitize: {
-                diag: {
-                    cfi: true,
-                },
-            },
-        },
     },
 
     apex_available: [