Revert of Try again to flip Win x86, x64 official builders 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 2c14a767d9f8de5e4b3b3afcfcf94a3d7da89687..724049737f9569ae8286d97adc128f97dda2570f 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -621,10 +621,10 @@
 
       # Currently the official bots set mini_installer_official_deps=1
       # but it's not clear if that's actually used anywhere.
-      'win': 'gn_official_x86',
+      'win': 'gyp_official',
       'win-asan': 'gyp_official_syzyasan',
       'win-pgo': 'gyp_official_winpgo',
-      'win64': 'gn_official_x64',
+      'win64': 'gyp_official_x64',
       'win64-pgo': 'gyp_official_winpgo_x64',
     },
 
@@ -637,8 +637,8 @@
       'precise64 trunk': 'gn_official',
       'win beta': 'gyp_official_six_concurrent_links',
       'win stable': 'gyp_official_six_concurrent_links',
-      'win trunk': 'gn_official_six_concurrent_links_x86',
-      'win64 trunk': 'gn_official_six_concurrent_links_x64',
+      'win trunk': 'gyp_official_six_concurrent_links',
+      'win64 trunk': 'gyp_official_x64_six_concurrent_links',
     },
 
     'tryserver.blink': {
@@ -1157,22 +1157,6 @@
       'gyp', 'official', 'goma', 'minimal_symbols', 'x86',
     ],
 
-    'gn_official_six_concurrent_links_x86': [
-      'gn', 'official', 'six_concurrent_links', 'x86',
-    ],
-
-    'gn_official_six_concurrent_links_x64': [
-      'gn', 'official', 'six_concurrent_links', 'x64',
-    ],
-
-    'gn_official_x64': [
-      'gn', 'official', 'x64',
-    ],
-
-    'gn_official_x86': [
-      'gn', 'official', 'x86',
-    ],
-
     'gn_release_bot': [
       'gn', 'release_bot',
     ],
@@ -1365,6 +1349,14 @@
 
     'gyp_official_winpgo_x64': [
       'gyp', 'error', 'x64',
+    ],
+
+    'gyp_official_x64': [
+      'gyp', 'official', 'x64',
+    ],
+
+    'gyp_official_x64_six_concurrent_links': [
+      'gyp', 'official', 'x64', 'six_concurrent_links',
     ],
 
     'gyp_release_bot': [