--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -104,16 +104,17 @@ flavors = {
     'NetBSD': 'netbsd',
     'OpenBSD': 'openbsd',
 }
 gyp_vars['OS'] = flavors.get(os)
 
 arches = {
     'x86_64': 'x64',
     'x86': 'ia32',
+    'aarch64': 'arm64',
 }
 
 gyp_vars['target_arch'] = arches.get(CONFIG['CPU_ARCH'], CONFIG['CPU_ARCH'])
 
 if CONFIG['ARM_ARCH']:
     if int(CONFIG['ARM_ARCH']) < 7:
         gyp_vars['armv7'] = 0
         gyp_vars['arm_neon_optional'] = 0

--- a/media/webrtc/trunk/build/common.gypi
+++ b/media/webrtc/trunk/build/common.gypi
@@ -1022,17 +1022,17 @@
                 'conditions': [
                   ['armv7==0', {
                     'android_app_abi%': 'armeabi',
                   }, {
                     'android_app_abi%': 'armeabi-v7a',
                   }],
                 ],
               }],
-              ['target_arch=="aarch64"', {
+              ['target_arch=="arm64"', {
                 'android_app_abi%': 'arm64-v8a',
                 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-arm64',
               }],
             ],
           },
           'android_ndk_root%': '<(android_ndk_root)',
           'android_app_abi%': '<(android_app_abi)',
           'android_ndk_sysroot%': '<(android_ndk_sysroot)',