Starting work on full GN build

build/config/android/config.gni

 # Copyright 2014 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.
 
 # This file contains common system config stuff for the Android build.
 
 if (is_android) {
   has_chrome_android_internal =
       exec_script("//build/dir_exists.py",
                   [ rebase_path("//clank", root_build_dir) ],
@@ skipping 33 matching lines @@
     run_findbugs = false
 
     # Set to true to enable the Errorprone compiler
     use_errorprone_java_compiler = false
   }
 
   # Host stuff -----------------------------------------------------------------
 
   # Defines the name the Android build gives to the current host CPU
   # architecture, which is different than the names GN uses.
-  if (host_cpu == "x64") {
+  if ((host_cpu == "x64") || (host_cpu == "x86")) {
     android_host_arch = "x86_64"
-  } else if (host_cpu == "x86") {
-    android_host_arch = "x86"
   } else {
     assert(false, "Need Android toolchain support for your build CPU arch.")
   }
 
   # Defines the name the Android build gives to the current host CPU
   # architecture, which is different than the names GN uses.
   if (host_os == "linux") {
     android_host_os = "linux"
   } else if (host_os == "mac") {
     android_host_os = "darwin"
@@ skipping 129 matching lines @@
   } else if (current_cpu == "arm64") {
     android_app_abi = "arm64-v8a"
   } else if (current_cpu == "mips64el") {
     android_app_abi = "mips64"
   } else {
     assert(false, "Unknown Android ABI: " + current_cpu)
   }
 
   android_log_tag = "\"flutter\""
 }