Remove descriptions for Android Debug GPU bots.

content/test/gpu/generate_buildbot_json.py

Index: content/test/gpu/generate_buildbot_json.py
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index 90dd5ce512147e807809e79dcab16019a3715f51..bc76c555f1b65a09c011639531db2f6ef12db3c5 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -397,83 +397,6 @@ FYI_WATERFALL = {
       'swarming': False,
       'os_type': 'linux',
     },
-    # TODO(kbr): remove the Debug Android bots once the waterfalls are
-    # restarted. crbug.com/617848
-    'Android Debug (Nexus 5)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'android',
-    },
-    'Android Debug (Nexus 5X)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'android',
-    },
-    'Android Swarmed Debug (Nexus 5X)': {
-      'swarming_dimensions': {
-        'device_type': 'bullhead',
-        'device_os': 'M',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      'swarming': True,
-      'os_type': 'android',
-    },
-    'Android Debug (Nexus 6)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'android',
-    },
-    'Android Debug (Nexus 6P)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'android',
-    },
-    'Android Debug (Nexus 9)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'android',
-    },
     'Android Release (Nexus 5)': {
       'swarming_dimensions': {
         # There are no PCI IDs on Android.