Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG.

Bug: 22033465

Change-Id: Ie011f888f55a2cfb5c943070a3844cb541812afe
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 55d0021..d46dff3 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -191,6 +191,7 @@
 LOCAL_DPI_FILE_STEM:=
 LOCAL_SANITIZE:=
 LOCAL_SANITIZE_RECOVER:=
+LOCAL_SANITIZE_DIAG:=
 LOCAL_NOSANITIZE:=
 LOCAL_DBUS_PROXY_PREFIX:=
 LOCAL_INIT_RC:=