Merge "Enable 64-bit CFI tests."