Merge "Change the global CFI flag to default to enabled."