Merge "Enable LOCAL_SANITIZE:=cfi and add LOCAL_SANITIZE_DIAG."
am: 2358c55d70

Change-Id: Ib36748ff1fe5f8bad82b37d27f9d1a94d5a8e0ee