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