bionic: rename aarch64 target to arm64

Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3

libc/kernel/tools/defaults.py

@@ -7,7 +7,7 @@ from utils import *
 
 # the list of supported architectures
 #
-kernel_archs = [ 'aarch64', 'arm', 'mips', 'x86' ]
+kernel_archs = [ 'arm', 'arm64', 'mips', 'x86' ]
 
 # the list of include directories that belong to the kernel
 # tree. used when looking for sources...
@@ -45,15 +45,15 @@ kernel_remove_config_macros = True
 # maps an architecture to a set of default macros that would be provided by
 # toolchain preprocessor
 kernel_default_arch_macros = {
-    "aarch64": {},
     "arm": {},
+    "arm64": {},
     "mips": {"CONFIG_32BIT":"1"},
     "x86": {},
     }
 
 kernel_arch_token_replacements = {
-    "aarch64": {},
     "arm": {},
+    "arm64": {},
     "mips": {"off_t":"__kernel_off_t"},
     "x86": {},
     }
@@ -66,13 +66,13 @@ kernel_token_replacements = {
 # this is the set of known static inline functions that we want to keep
 # in the final ARM headers. this is only used to keep optimized byteswapping
 # static functions and stuff like that.
-kernel_known_aarch64_statics = set(
-        [
+kernel_known_arm_statics = set(
+        [ "___arch__swab32",    # asm-arm/byteorder.h
         ]
     )
 
-kernel_known_arm_statics = set(
-        [ "___arch__swab32",    # asm-arm/byteorder.h
+kernel_known_arm64_statics = set(
+        [
         ]
     )
 
@@ -100,8 +100,8 @@ kernel_known_generic_statics = set(
 # we want to keep in the final headers
 #
 kernel_known_statics = {
-        "aarch64" : kernel_known_aarch64_statics,
         "arm" : kernel_known_arm_statics,
+        "arm64" : kernel_known_arm64_statics,
         "mips" : kernel_known_mips_statics,
         "x86" : kernel_known_x86_statics,
     }