Merge "bionic: rename aarch64 target to arm64"