Merge "Change the global CFI flag to default to enabled."
am: 45fd769588

Change-Id: I89f1efa7c08a1e4fc3df2987948b3965497b35c3