am 918402d4: am a8ddb1bc: am f0387da7: Merge "Rename arch-aarch64 to arch-arm64"

* commit '918402d4fdb45b4696343c9055164bcad25dc38c':
  Rename arch-aarch64 to arch-arm64