Minor changes to ARCH and ABI names for aarch64-gcc.

Change-Id: I9d7c23a43a0984190ab811efa44da71a7f559ca4
diff --git a/build/tools/prebuilt-common.sh b/build/tools/prebuilt-common.sh
index 31bf12e..d426fa2 100644
--- a/build/tools/prebuilt-common.sh
+++ b/build/tools/prebuilt-common.sh
@@ -1014,10 +1014,10 @@
         ABI_CONFIGURE_TARGET="arm-eabi"
         ABI_CONFIGURE_EXTRA_FLAGS="--with-arch=armv5te --disable-gold"
         ;;
-    aarch64-linux-androideabi-*)
-        ARCH="arm"
-        ABI="aarch64"
-        ABI_CONFIGURE_TARGET="aarch64-linux-androideabi"
+    aarch64-linux-android-*)
+        ARCH="aarch64"
+        ABI="aarch64-v8a"
+        ABI_CONFIGURE_TARGET="aarch64-linux-android"
         # Note:
         # --disable-libgomp because libgomp/configure tries to link when we don't have crt*.o for aarch64 yet.
         # --disable-gold because gold doesn't support aarch64 yet