am f0387da7: Merge "Rename arch-aarch64 to arch-arm64"

* commit 'f0387da709d79da5fc857fe9abf5bd1857784442':
  Rename arch-aarch64 to arch-arm64