Merge "Fix optimizing_cfi_test and arm64 code generation."