Starting work on full GN build

build/config/android/config.gni

Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 5457b889efd79a27c25658d0c03b1af5a2f5e7c8..a16407bbfc7d1f2554190458388b428c5e0164ca 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -51,10 +51,8 @@ if (is_android) {
 
   # 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.")
   }