Roll GN binaries to #317120 for the cpu_arch changes

build/toolchain/android/BUILD.gn

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/sysroot.gni")  # Imports android/config.gni.
 import("//build/toolchain/ccache.gni")
 import("//build/toolchain/clang.gni")
 import("//build/toolchain/goma.gni")
 import("//build/toolchain/gcc_toolchain.gni")
 
@@ skipping 33 matching lines @@
     } else {
       compiler_prefix = ""
     }
 
     cc = compiler_prefix + tool_prefix + "gcc"
     cxx = compiler_prefix + tool_prefix + "g++"
     ar = tool_prefix + "ar"
     ld = cxx
 
     toolchain_os = "android"
-    toolchain_cpu_arch = invoker.toolchain_cpu_arch
+    toolchain_cpu = invoker.toolchain_cpu
 
     # We make the assumption that the gcc_toolchain will produce a soname with
     # the following definition.
     soname = "{{target_output_name}}{{output_extension}}"
 
     stripped_soname = "lib.stripped/${soname}"
     temp_stripped_soname = "${stripped_soname}.tmp"
 
     android_strip = "${tool_prefix}strip"
 
@@ skipping 13 matching lines @@
     postlink = "$mkdir_command && $strip_command"
     link_outputs = [ stripped_exe ]
   }
 }
 
 android_gcc_toolchain("x86") {
   android_ndk_sysroot = "$android_ndk_root/$x86_android_sysroot_subdir"
   android_ndk_lib_dir = "usr/lib"
 
   tool_prefix = "$x86_android_toolchain_root/bin/i686-linux-android-"
-  toolchain_cpu_arch = "x86"
+  toolchain_cpu = "x86"
 }
 
 android_gcc_toolchain("arm") {
   android_ndk_sysroot = "$android_ndk_root/$arm_android_sysroot_subdir"
   android_ndk_lib_dir = "usr/lib"
 
   tool_prefix = "$arm_android_toolchain_root/bin/arm-linux-androideabi-"
-  toolchain_cpu_arch = "arm"
+  toolchain_cpu = "arm"
 }
 
 android_gcc_toolchain("mipsel") {
   android_ndk_sysroot = "$android_ndk_root/$mips_android_sysroot_subdir"
   android_ndk_lib_dir = "usr/lib"
 
   tool_prefix = "$mips_android_toolchain_root/bin/mipsel-linux-android-"
-  toolchain_cpu_arch = "mipsel"
+  toolchain_cpu = "mipsel"
 }
 
 android_gcc_toolchain("x64") {
   android_ndk_sysroot = "$android_ndk_root/$x86_64_android_sysroot_subdir"
   android_ndk_lib_dir = "usr/lib64"
 
   tool_prefix = "$x86_64_android_toolchain_root/bin/x86_64-linux-android-"
-  toolchain_cpu_arch = "x86_64"
+  toolchain_cpu = "x86_64"
 }
 
 android_gcc_toolchain("arm64") {
   android_ndk_sysroot = "$android_ndk_root/$arm64_android_sysroot_subdir"
   android_ndk_lib_dir = "usr/lib"
 
   tool_prefix = "$arm64_android_toolchain_root/bin/arm-linux-androideabi-"
-  toolchain_cpu_arch = "aarch64"
+  toolchain_cpu = "aarch64"
 }
 
 android_gcc_toolchain("mips64el") {
   android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir"
   android_ndk_lib_dir = "usr/lib64"
 
   tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-"
-  toolchain_cpu_arch = "mipsel64el"
+  toolchain_cpu = "mipsel64el"
 }