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

Change-Id: Ie5a198a5ff1c3eac9edb0e0c4e184f3091688d76