Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG." am: 2358c55d70 am: 04b11c5acd
am: 9eddd0620c

Change-Id: I06999b22af259785258e6b198c439c3538023f6a