Merge "Remove CFI diagnostics."
am: ebd8c69ac5

Change-Id: I95f13a0270783e0f2d4057c254380fe97f4e47ab