Flip full, perf Mac and Win builders back to GYP.

This will give us a bit more test coverage prior to
the branch.

R=brettw@chromium.org
BUG=618468, 605318

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

tools/mb/mb_config.pyl

@@ -14,8 +14,8 @@
     'chromium': {
       'Android': 'android_without_codecs_gn_release_bot_minimal_symbols',
       'Linux x64': 'noswarming_gn_release_bot',
-      'Mac': 'noswarming_gn_release_bot_mac_strip',
-      'Win': 'noswarming_gn_release_bot_minimal_symbols_x86',
+      'Mac': 'noswarming_gyp_release_bot_mac_strip',
+      'Win': 'noswarming_gyp_release_bot_minimal_symbols_x86',
       'Win x64': 'noswarming_gn_release_bot_minimal_symbols_x64',
     },
 
@@ -470,7 +470,7 @@
       'Mac 10.11 Perf (3)': 'none',
       'Mac 10.11 Perf (4)': 'none',
       'Mac 10.11 Perf (5)': 'none',
-      'Mac Builder': 'gn_official_goma',
+      'Mac Builder': 'gyp_official_goma',
       'Mac HDD Perf (1)': 'none',
       'Mac HDD Perf (2)': 'none',
       'Mac HDD Perf (3)': 'none',
@@ -518,7 +518,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',
@@ -1158,6 +1158,10 @@
       'gn', 'official', 'goma', 'minimal_symbols', 'x86',
     ],
 
+    'gyp_official_goma_minimal_symbols_x86': [
+      'gyp', 'official', 'goma', 'minimal_symbols', 'x86',
+    ],
+
     'gn_release_bot': [
       'gn', 'release_bot',
     ],
@@ -1431,6 +1435,10 @@
       'noswarming', 'gn', 'release_bot', 'minimal_symbols', 'x86',
     ],
 
+    'noswarming_gyp_release_bot_minimal_symbols_x86': [
+      'noswarming', 'gyp', 'release_bot', 'minimal_symbols', 'x86',
+    ],
+
     'noswarming_gn_release_bot_x64': [
       'noswarming', 'gn', 'release_bot', 'x64',
     ],
@@ -1439,6 +1447,10 @@
       'noswarming', 'gn', 'release_bot', 'mac_strip',
     ],
 
+    'noswarming_gyp_release_bot_mac_strip': [
+      'noswarming', 'gyp', 'release_bot', 'mac_strip',
+    ],
+
     'noswarming_gn_release_trybot_x64': [
       'noswarming', 'gn', 'release_trybot', 'x64',
     ],