Merge "ndk: rename aarch64 target to arm64"