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

Change-Id: Ic64b846efb2f47507c0ff5220b6cdbad30b3ddbd