Update the MB builder mapping w/ a few changes.

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 71 matching lines @@
           'swarming_chromeos_ozone_gn_release_bot',
       'Linux ChromiumOS Ozone Tests (1)': 'none',
       'Linux ChromiumOS Tests (1)': 'none',
       'Linux ChromiumOS Tests (dbg)(1)': 'none',
     },
 
     'chromium.fyi': {
       'Afl Upload Linux ASan': 'gn_release_afl_asan',
       'Android ChromeDriver Tests (dbg)': 'none',
       'Android Cloud Tests': 'android_gn_debug_static_bot_x86',
+      'Android Find Annotated Tests': 'none',
       'Android Remoting Tests': 'none',
       'Android Tests (trial)(dbg)': 'none',
       'Android Tests (x86 emulator)': 'android_gn_debug_static_bot_x86',
       'Android Builder (dbg)': 'android_gn_debug_static_bot',
       'Browser Side Navigation Linux': 'gn_release_bot',
       'CFI Linux CF': 'gn_cfi_diag_release_static',
       'CFI Linux ToT': 'gn_cfi_clang_tot_release_static',
       'CFI Linux': 'gn_cfi_release_static',
       'Chromium Linux Goma Canary': 'gn_release_bot',
       'Chromium Linux Goma Canary (clobber)': 'gn_release_bot',
@@ skipping 382 matching lines @@
       'Win 7 ATI GPU Perf (1)': 'none',
       'Win 7 ATI GPU Perf (2)': 'none',
       'Win 7 ATI GPU Perf (3)': 'none',
       'Win 7 ATI GPU Perf (4)': 'none',
       'Win 7 ATI GPU Perf (5)': 'none',
       'Win 7 Intel GPU Perf (1)': 'none',
       'Win 7 Intel GPU Perf (2)': 'none',
       'Win 7 Intel GPU Perf (3)': 'none',
       'Win 7 Intel GPU Perf (4)': 'none',
       'Win 7 Intel GPU Perf (5)': 'none',
-      'Win 7 Low-End Perf (1)': 'none',
-      'Win 7 Low-End Perf (2)': 'none',
       'Win 7 Nvidia GPU Perf (1)': 'none',
       'Win 7 Nvidia GPU Perf (2)': 'none',
       'Win 7 Nvidia GPU Perf (3)': 'none',
       'Win 7 Nvidia GPU Perf (4)': 'none',
       'Win 7 Nvidia GPU Perf (5)': 'none',
       'Win 7 Perf (1)': 'none',
       'Win 7 Perf (2)': 'none',
       'Win 7 Perf (3)': 'none',
       'Win 7 Perf (4)': 'none',
       'Win 7 Perf (5)': 'none',
@@ skipping 275 matching lines @@
       'linux_optional_gpu_tests_rel':
         'swarming_gpu_fyi_tests_gn_release_trybot',
       'linux_site_isolation': 'gn_release_trybot',
       'linux_upload_clang': 'gn_release_bot',
     },
 
     'tryserver.chromium.mac': {
       'ios-device': 'ios_gyp',
       'ios-device-gn': 'ios_gn',
       'ios-simulator': 'ios_gyp',
-      'ios-simulator-cronet': 'ios_gyp',

[smut, 2016/07/21 23:46:31]

Er, why did this need to be removed?

       'ios-simulator-gn': 'ios_gn',
       'mac_chromium_10.10_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'mac_chromium_10.10_macviews': 'mac_views_browser_gyp_release_trybot',
       'mac_chromium_archive_rel_ng': 'noswarming_gn_release_bot_mac_strip',
       'mac_chromium_asan_rel_ng': 'swarming_asan_dcheck_gyp_release_bot',
       'mac_chromium_asan_variable': 'findit',
       'mac_chromium_compile_dbg_ng': 'swarming_gn_debug_trybot',
       'mac_chromium_compile_rel_ng': 'swarming_gpu_tests_gn_release_trybot',
       'mac_chromium_dbg_ng': 'swarming_gn_debug_trybot',
       'mac_chromium_gyp_dbg': 'swarming_gyp_debug_trybot',
@@ skipping 1506 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',
     },
   },
 }