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

* commit '3326967a3ffa565badbf6e50a053cf74ab4704a5':
  Rename arch-aarch64 to arch-arm64