Fix MB configs for Mac, Win nacl_sdk builders.

tools/mb/mb_config.pyl

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 792 matching lines @@
       'mac_chromium_variable': 'findit',
       'mac_chromium_variable_10.10': 'findit',
       'mac_chromium_variable_10.10_macviews': 'findit',
       'mac_chromium_variable_10.10_layout': 'findit',
       'mac_chromium_variable_10.11': 'findit',
       'mac_chromium_variable_10.11_layout': 'findit',
       'mac_chromium_variable_archive': 'findit',
       'mac_chromium_variable_chrome': 'findit',
       'mac_chromium_variable_gn': 'findit',
       'mac_chromium_variable_layout': 'findit',
-      'mac_nacl_sdk': 'nacl_annotator',
-      'mac_nacl_sdk_build': 'nacl_annotator',
+      'mac_nacl_sdk': 'gyp_release_bot',
+      'mac_nacl_sdk_build': 'gyp_release_bot',
       'mac_optional_gpu_tests_rel':
         'swarming_gpu_fyi_tests_gyp_release_trybot',
       'mac_upload_clang': 'gn_release_bot',
     },
 
     'tryserver.chromium.perf': {
       'android_arm64_perf_bisect_builder':
         'gn_official_goma_minimal_symbols_android_arm64',
       'android_fyi_perf_bisect': 'gn_official_goma_minimal_symbols_android',
       'android_nexus5X_perf_bisect':
@@ skipping 59 matching lines @@
       'win_chromium_variable_webkit_builder': 'findit',
       'win_chromium_variable_webkit_layout': 'findit',
       'win_chromium_variable_webkit_win7_builder': 'findit',
       'win_chromium_variable_webkit_win7_builder_x64': 'findit',
       'win_chromium_x64_rel_ng': 'swarming_gn_release_trybot_x64',
       'win_clang': 'win_clang_debug_bot',
       'win_clang_dbg': 'swarming_gyp_clang_debug_trybot_x86',
       'win_clang_rel': 'swarming_gyp_clang_official_release_trybot_x86',
       'win_clang_x64_dbg': 'win_clang_debug_bot',
       'win_clang_x64_rel': 'swarming_gyp_clang_official_release_trybot_x64',
-      'win_nacl_sdk': 'nacl_annotator',
-      'win_nacl_sdk_build': 'nacl_annotator',
+      'win_nacl_sdk': 'gyp_release_bot_minimal_symbols_x86',
+      'win_nacl_sdk_build': 'gyp_release_bot_minimal_symbols_x86',
       'win_optional_gpu_tests_rel':
         'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
       'win_pgo': 'gyp_official_winpgo',
       'win_upload_clang': 'gn_release_bot',
       'win_chrome_official': 'gn_official_goma_minimal_symbols_x86',
       'win_x64_chromium_variable_builder': 'findit',
     },
 
     'tryserver.v8': {
       'v8_android_chromium_gn_dbg': 'android_gn_debug_bot',
@@ skipping 495 matching lines @@
     'ios_gyp': ['gyp', 'error'],
 
     'mac_views_browser_gyp_release_bot': [
       'mac_views_browser', 'gyp', 'release_bot',
     ],
 
     'mac_views_browser_gyp_release_trybot': [
       'mac_views_browser', 'gyp', 'release_trybot',
     ],
 
-    # This is used to indicate that the bot runs the nacl annotator-based
-    # configs and switching them is out of scope for MB.
-    'nacl_annotator': [ 'error' ],
-
     # This is used for tracking purposes; any bot that uses this config
     # should never actually run MB.
     'none': [
       'error',
     ],
 
     'noswarming_gn_debug_bot_x64': [
       'noswarming', 'gn', 'debug_bot', 'x64',
     ],
 
@@ skipping 895 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }