Remove descriptions for Android Debug GPU bots.

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 227 matching lines @@
       'Mac 10.10 Release (Intel)': 'none',
       'Mac 10.10 Retina Debug (AMD)': 'none',
       'Mac 10.10 Retina Release (AMD)': 'none',
       'Win7 Debug (NVIDIA)': 'none',
       'Win7 Release (ATI)': 'none',
       'Win7 Release (NVIDIA)': 'none',
     },
 
     'chromium.gpu.fyi': {
       # These all use the 'trybot' mixins to ensure that dcheck is on.
-      # TODO(kbr): remove the Android Debug bots once the waterfalls
-      # are restarted. crbug.com/617848
-      'Android Debug (Nexus 5)': 'android_gn_debug_static_trybot',
-      'Android Debug (Nexus 5X)': 'android_gn_debug_static_trybot_arm64',
-      'Android Swarmed Debug (Nexus 5X)':
-        'android_gn_debug_static_trybot_arm64',
-      'Android Debug (Nexus 6)': 'android_gn_debug_static_trybot',
-      'Android Debug (Nexus 9)': 'android_gn_debug_static_trybot_arm64',
       'Android Release (Nexus 5)': 'android_gn_release_trybot',
       'Android Release (Nexus 5X)': 'swarming_android_gn_release_trybot_arm64',
       'Android Release (Nexus 6)': 'android_gn_release_trybot',
       'Android Release (Nexus 6P)': 'android_gn_release_trybot_arm64',
       'Android Release (Nexus 9)': 'android_gn_release_trybot_arm64',
       'GPU Linux Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'GPU Linux Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'GPU Mac Builder': 'swarming_gpu_fyi_tests_gyp_release_trybot',
       'GPU Mac Builder (dbg)': 'swarming_gpu_fyi_tests_gyp_debug_trybot',
       'GPU Win Builder': 'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
@@ skipping 724 matching lines @@
     ],
 
     'android_gn_debug_static_bot_x86': [
       'android', 'gn', 'debug_static_bot', 'x86',
     ],
 
     'android_gn_debug_static_minimal_symbols_mipsel': [
       'android', 'gn', 'debug', 'static', 'minimal_symbols', 'mipsel',
     ],
 
-    'android_gn_debug_static_trybot': [
-      'android', 'gn', 'debug_static_trybot',
-    ],
-
-    'android_gn_debug_static_trybot_arm64': [
-      'android', 'gn', 'debug_static_trybot', 'arm64',
-    ],
-
     'android_gn_debug_trybot_java_coverage': [
       'android', 'gn', 'debug_trybot', 'java_coverage',
     ],
 
     'android_gn_debug_trybot_mipsel': [
       'android', 'gn', 'debug_trybot', 'mipsel',
     ],
 
     'android_gn_debug_trybot_x64': [
       'android', 'gn', 'debug_trybot', 'x64',
@@ skipping 1028 matching lines @@
     },
 
     'debug_symbols_static_bot': {
       'mixins': ['debug', 'static', 'goma'],
     },
 
     'debug_static_bot': {
       'mixins': ['debug', 'static', 'minimal_symbols', 'goma'],
     },
 
-    'debug_static_trybot': {
-      'mixins': ['debug', 'static', 'dcheck_always_on', 'minimal_symbols',
-                 'goma'],
-    },
-
     'debug_trybot': {
       'mixins': ['debug_bot_minimal_symbols'],
     },
 
     'disable_nacl': {
       'gn_args': 'enable_nacl=false',
       'gyp_defines': 'disable_nacl=1',
     },
 
     'disable_precompiled_headers': {
@@ skipping 273 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',
     },
   },
 }