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

Change-Id: Iafb3730cc96056b09e26fa95e9bf9e73588d4315