Revert of Try yet again to flip official win 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 cef02869ea4567ceae2793fef0faf707de8eb2cd..974bc52c6622ce35f79020030dcd02e66f1d0998 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -540,7 +540,7 @@
       'Win 8 Perf (3)': 'none',
       'Win 8 Perf (4)': 'none',
       'Win 8 Perf (5)': 'none',
-      'Win Builder': 'gn_official_goma_minimal_symbols_x86',
+      'Win Builder': 'gyp_official_goma_minimal_symbols_x86',
       'Win Zenbook Perf (1)': 'none',
       'Win Zenbook Perf (2)': 'none',
       'Win Zenbook Perf (3)': 'none',
@@ -651,13 +651,13 @@
 
       # 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': 'gn_official_syzyasan_x86',
       'win-pgo': [
         'gn_official_chrome_pgo_phase_1_x86',
         'gn_official_chrome_pgo_phase_2_x86',
       ],
-      'win64': 'gn_official_x64',
+      'win64': 'gyp_official_x64',
       'win64-pgo': [
         'gn_official_chrome_pgo_phase_1_x64',
         'gn_official_chrome_pgo_phase_2_x64',
@@ -671,10 +671,10 @@
       'precise64 beta': 'gn_official',
       'precise64 stable': 'gn_official',
       'precise64 trunk': 'gn_official',
-      'win beta': 'gn_official_six_concurrent_links',
-      'win stable': 'gn_official_six_concurrent_links',
-      'win trunk': 'gn_official_six_concurrent_links',
-      'win64 trunk': 'gn_official_x64_six_concurrent_links',
+      'win beta': 'gyp_official_six_concurrent_links',
+      'win stable': 'gyp_official_six_concurrent_links',
+      'win trunk': 'gyp_official_six_concurrent_links',
+      'win64 trunk': 'gyp_official_x64_six_concurrent_links',
     },
 
     'tryserver.blink': {
@@ -1181,10 +1181,6 @@
       'gn', 'official',
     ],
 
-    'gn_official_x86': [
-      'gn', 'official', 'x86',
-    ],
-
     'gn_official_goma': [
       'gn', 'official', 'goma',
     ],
@@ -1209,8 +1205,8 @@
       'gn', 'official', 'goma', 'minimal_symbols', 'x86',
     ],
 
-    'gn_official_goma_minimal_symbols_x86': [
-      'gn', 'official', 'goma', 'minimal_symbols', 'x86',
+    'gyp_official_goma_minimal_symbols_x86': [
+      'gyp', 'official', 'goma', 'minimal_symbols', 'x86',
     ],
 
     'gn_release_bot': [
@@ -1379,8 +1375,8 @@
       'gn', 'official', 'syzyasan', 'x86',
     ],
 
-    'gn_official_six_concurrent_links': [
-      'gn', 'official', 'six_concurrent_links',
+    'gyp_official_six_concurrent_links': [
+      'gyp', 'official', 'six_concurrent_links',
     ],
 
     'gn_official_chrome_pgo_phase_1_x64': [
@@ -1415,12 +1411,12 @@
       'gn', 'official_optimize', 'chrome_pgo_phase_2', 'x86',
     ],
 
-    'gn_official_x64': [
-      'gn', 'official', 'x64',
-    ],
-
-    'gn_official_x64_six_concurrent_links': [
-      'gn', 'official', 'x64', 'six_concurrent_links',
+    'gyp_official_x64': [
+      'gyp', 'official', 'x64',
+    ],
+
+    'gyp_official_x64_six_concurrent_links': [
+      'gyp', 'official', 'x64', 'six_concurrent_links',
     ],
 
     'gn_release_trybot_x86': [