Revert of Try yet again to flip official win builders to GN. (patchset #2...

Revert of Try yet again to flip official win builders to GN. (patchset #2 id:20001 of https://codereview.chromium.org/2192303002/ )

Reason for revert:
All the NaCl tests are crashing with "Actual: "Plugin crashed. 'NaCl module crashed" since
https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%281%29/builds/55504

This seems to be the most likely cause :(

There's also an outstanding issue with win-pgo (see BUG=)

BUG=632864

Original issue's description:
> Try yet again to flip official win builders to GN.
>
> TBR=brettw@chromium.org
> NOTRY=true
> BUG=623659
>
> Committed: https://crrev.com/00b24690630408d352edb0eb825423a71eccecb3
> Cr-Commit-Position: refs/heads/master@{#408782}

TBR=brettw@chromium.org,dpranke@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=623659
NOTRY=true

Review-Url: https://codereview.chromium.org/2196993002
Cr-Commit-Position: refs/heads/master@{#408896}

tools/mb/mb_config.pyl

@@ -582,7 +582,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',
@@ -693,13 +693,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',
@@ -713,10 +713,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': {
@@ -1224,10 +1224,6 @@
       'gn', 'official',
     ],
 
-    'gn_official_x86': [
-      'gn', 'official', 'x86',
-    ],
-
     'gn_official_goma': [
       'gn', 'official', 'goma',
     ],
@@ -1252,8 +1248,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': [
@@ -1424,8 +1420,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': [
@@ -1460,12 +1456,12 @@
       'gn', 'official_optimize', 'chrome_pgo_phase_2', 'x86',
     ],
 
-    'gn_official_x64': [
-      'gn', 'official', 'x64',
+    'gyp_official_x64': [
+      'gyp', 'official', 'x64',
     ],
 
-    'gn_official_x64_six_concurrent_links': [
-      'gn', 'official', 'x64', 'six_concurrent_links',
+    'gyp_official_x64_six_concurrent_links': [
+      'gyp', 'official', 'x64', 'six_concurrent_links',
     ],
 
     'gn_release_trybot_x86': [