Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG."

diff --cc core/clear_vars.mk
index 4f0c839,d46dff3..0f3ecc3
--- 1/core/clear_vars.mk
--- 2/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@@ -197,8 -191,8 +197,9 @@@ LOCAL_DPI_VARIANTS:
  LOCAL_DPI_FILE_STEM:=
  LOCAL_SANITIZE:=
  LOCAL_SANITIZE_RECOVER:=
+ LOCAL_SANITIZE_DIAG:=
  LOCAL_NOSANITIZE:=
 +LOCAL_DATA_BINDING:=
  LOCAL_DBUS_PROXY_PREFIX:=
  LOCAL_INIT_RC:=
  LOCAL_MODULE_SYMLINKS:=