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

Change-Id: I404b647c05086d85fc18ee677f026511f6f21657