am 7e2b83dd: am 3326967a: am 918402d4: am a8ddb1bc: am f0387da7: Merge "Rename arch-aarch64 to arch-arm64"

* commit '7e2b83ddbb8090c0ea00cb1a6ae357b1156c5c94':