Merge "Rename arch-aarch64 to arch-arm64"