Revert of Try again to flip x86 Linux bots to GN.

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index e09e3c960bc2a57f061c138e03743560a0171a0a..968f6dbe50c49e073b503449087a15a4351801ba 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -98,7 +98,7 @@
       'Chromium Linux Goma Canary': 'gn_release_bot',
       'Chromium Linux Goma Canary (clobber)': 'gn_release_bot',
       'Chromium Linux Precise Goma LinkTest': 'gn_release_bot',
-      'Chromium Linux32 Goma Canary (clobber)': 'gn_release_bot_x86',
+      'Chromium Linux32 Goma Canary (clobber)': 'gyp_release_bot_x86',
       'Chromium Mac 10.10 MacViews': 'mac_views_browser_gyp_release_bot',
       'Chromium Mac 10.11': 'gyp_release_bot',
       'Chromium Mac 10.11 Force Mac Toolchain': 'gyp_release_bot',
@@ -305,7 +305,7 @@
       'Cast Android (dbg)': 'android_cast_gn_debug_static_bot',
       'Cast Linux': 'cast_gn_release_bot',
       'Linux Builder (dbg)': 'swarming_gn_debug_bot',
-      'Linux Builder (dbg)(32)': 'swarming_gn_debug_bot_x86',
+      'Linux Builder (dbg)(32)': 'swarming_gyp_debug_bot_no_symbols_x86',
       'Linux Builder': 'swarming_gn_release_bot',
       'Linux Tests (dbg)(1)': 'none',
       'Linux Tests (dbg)(1)(32)': 'none',
@@ -729,10 +729,10 @@
       'linux_chromium_chromeos_variable': 'findit',
       'linux_chromium_chromeos_variable_chrome': 'findit',
       'linux_chromium_clobber_rel_ng': 'gn_release_trybot',
-      'linux_chromium_compile_dbg_32_ng': 'swarming_gn_debug_trybot_x86',
+      'linux_chromium_compile_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
       'linux_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot',
       'linux_chromium_compile_rel_ng': 'swarming_gn_release_trybot',
-      'linux_chromium_dbg_32_ng': 'swarming_gn_debug_trybot_x86',
+      'linux_chromium_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
       'linux_chromium_dbg_ng': 'swarming_gn_debug_trybot',
       'linux_chromium_gn_chromeos_dbg': 'chromeos_gn_debug_bot',
       'linux_chromium_gn_chromeos_rel': 'chromeos_ozone_gn_release_trybot',
@@ -1143,10 +1143,6 @@
       'gn', 'release_bot_minimal_symbols', 'x86',
     ],
 
-    'gn_release_bot_x86': [
-      'gn', 'release_bot', 'x86',
-    ],
-
     'gn_release_drmemory_drfuzz': [
       'gn', 'release', 'drmemory', 'drfuzz', 'proprietary_codecs',
     ],
@@ -1335,6 +1331,10 @@
 
     'gyp_release_bot_minimal_symbols_x86': [
       'gyp', 'release_bot_minimal_symbols', 'x86'
+    ],
+
+    'gyp_release_bot_x86': [
+      'gyp', 'release_bot', 'x86',
     ],
 
     'gyp_release_trybot': [
@@ -1500,33 +1500,29 @@
       'chromeos_with_codecs', 'goma', 'gyp', 'ozone', 'static', 'swarming',
     ],
 
+    'swarming_clang_tot_shared_debug': [
+      'swarming', 'gn', 'clang_tot', 'shared', 'debug',
+    ],
+
+    'swarming_gn_asan_lsan_release_bot': [
+      'swarming', 'gn', 'asan', 'lsan', 'release_bot',
+    ],
+
+    'swarming_gn_debug_bot': [
+      'swarming', 'gn', 'debug_bot',
+    ],
+
+    'swarming_gn_debug_bot_minimal_symbols_x64': [
+      'swarming', 'gn', 'debug_bot_minimal_symbols', 'x64',
+    ],
+
     'swarming_clang_tot_lld_release_shared': [
       # TODO(crbug.com/605819): Enable debug info in release builds.
       'swarming', 'gn', 'clang_tot', 'release', 'shared', 'use_lld',
     ],
 
-    'swarming_clang_tot_shared_debug': [
-      'swarming', 'gn', 'clang_tot', 'shared', 'debug',
-    ],
-
-    'swarming_gn_asan_lsan_release_bot': [
-      'swarming', 'gn', 'asan', 'lsan', 'release_bot',
-    ],
-
-    'swarming_gn_debug_bot': [
-      'swarming', 'gn', 'debug_bot',
-    ],
-
-    'swarming_gn_debug_bot_minimal_symbols_x64': [
-      'swarming', 'gn', 'debug_bot_minimal_symbols', 'x64',
-    ],
-
     'swarming_gn_debug_bot_minimal_symbols_x86': [
       'swarming', 'gn', 'debug_bot_minimal_symbols', 'x86',
-    ],
-
-    'swarming_gn_debug_bot_x86': [
-      'swarming', 'gn', 'debug_bot', 'x86',
     ],
 
     'swarming_gn_debug_trybot': [
@@ -1800,6 +1796,10 @@
 
     'swarming_gyp_debug_bot_minimal_symbols_x86': [
       'swarming', 'gyp', 'debug_bot_minimal_symbols', 'x86',
+    ],
+
+    'swarming_gyp_debug_bot_no_symbols_x86': [
+      'swarming', 'gyp', 'debug_bot', 'no_symbols', 'x86',
     ],
 
     'swarming_gyp_debug_trybot': [