Merge "Change the global CFI flag to default to enabled." am: eddf74cadb am: 69a345338a
am: bb68c9e60a

Change-Id: I97ae72f5d8b3606e83a601b188c86077ea89a89c