Merge "Disable CFI for ASAN targets. (Make)"
am: 594eb16b02

Change-Id: I5d148e2d38f244c1779b79b10d893d6e551d6e9b