[Android] Switch the x86, x64, and mips builders on chromium.android to mb.

scripts/slave/recipes/chromium.expected/full_chromium_android_Android_x86_Builder__dbg_.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_x86_Builder__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_GN_Builder__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_x86_Builder__dbg_.json
similarity index 92%
copy from scripts/slave/recipes/chromium.expected/full_chromium_android_Android_GN_Builder__dbg_.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_android_Android_x86_Builder__dbg_.json
index 63d4ac0c7166601bc9e7e36517d3b4741686a160..6b7e7dcd7e3c0e0c3f4e2c4397853d5664724813 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_GN_Builder__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_x86_Builder__dbg_.json
@@ -7,7 +7,7 @@
       "--master",
       "chromium.android",
       "--builder",
-      "Android GN Builder (dbg)",
+      "Android x86 Builder (dbg)",
       "--slave",
       "TestSlavename",
       "--spec",
@@ -102,7 +102,7 @@
     "env": {
       "GYP_CHROMIUM_NO_ACTION": "1",
       "GYP_CROSSCOMPILE": "1",
-      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
+      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "gclient runhooks"
@@ -120,7 +120,7 @@
       "--paths",
       "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
       "--properties",
-      "{\"buildername\": \"Android GN Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
+      "{\"buildername\": \"Android x86 Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "get compile targets for scripts",
@@ -201,7 +201,7 @@
       "-m",
       "chromium.android",
       "-b",
-      "Android GN Builder (dbg)",
+      "Android x86 Builder (dbg)",
       "--config-file",
       "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
       "--goma-dir",
@@ -249,13 +249,13 @@
       "--target",
       "Debug",
       "--build-url",
-      "gs://chromium-android-archive/chromium.android/Android GN Builder (dbg)",
+      "gs://chromium-android-archive/chromium.android/Android x86 Builder (dbg)",
       "--build_revision",
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android GN Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android x86 Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android GN Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android x86 Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "package build"