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

Change-Id: I437e67c919454dda90bfdfcb69a51c949e35d8d8