Merge "Fix optimizing_cfi_test and arm64 code generation." am: 6e5fa09510 am: 5e35ad4904
am: 8e8a855e28

Change-Id: I81a0f2f4664a194f3ad424d7852f47a1099057b8