Update the MB builder mapping w/ a few changes.

A couple of builders have been removed, and one has been added
but it doesn't do compiles.

TBR=brettw@chromium.org
BUG=

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

tools/mb/mb_config.pyl

@@ -89,6 +89,7 @@
       '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',
@@ -492,8 +493,6 @@
       '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',
@@ -797,7 +796,6 @@
       'ios-device': 'ios_gyp',
       'ios-device-gn': 'ios_gn',
       'ios-simulator': 'ios_gyp',
-      'ios-simulator-cronet': 'ios_gyp',
       '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_gn_release_trybot',