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

Change-Id: I990f0d71c02fd5d66b4071d5ea0c6b0fb9527408