Merge "Remove CFI diagnostics." am: ebd8c69ac5 am: 9267f7a253
am: 7dac08bb5b

Change-Id: I67ac542950e6f2b8a65909b6f5c46ad52430f51c
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk
index c7619af..7a10302 100644
--- a/cmds/stagefright/Android.mk
+++ b/cmds/stagefright/Android.mk
@@ -191,7 +191,6 @@
 LOCAL_MODULE:= mediafilter
 
 LOCAL_SANITIZE := cfi
-LOCAL_SANITIZE_DIAG := cfi
 
 include $(BUILD_EXECUTABLE)