Merge "Fix arm64 inline assembly code typo." am: 04bcf552a2 am: 2e71f4d68e
am: a102698fb4

Change-Id: I8307a0d807cca351c3604120b5d884f6381cd296