Remove android_test trybot type

masters/master.tryserver.chromium/slaves.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright (c) 2012 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.
 
 # See master.experimental/slaves.cfg for documentation.
 
 # down slaves don't cause re-allocation, just removal
 down_slaves = [
@@ skipping 192 matching lines @@
       'version': 'lucid',
       'bits': '64',
     } for i in (2, 4, 5, 6)
   ]
 
 
 def android():
   compile_slaves = [
     {
       'master': 'TryServer',
-      'builder': ['android', 'android_builder'],
+      'builder': ['android', 'android_dbg', 'android_fyi_dbg'],
       'hostname': 'vm%d-m4' % i,
       'os': 'linux',
       'version': 'lucid',
       'bits': '64',
     } for i in range(430, 468)
   ]
 
   test_slaves = [
     {
       'master': 'TryServer',
-      'builder': ['android_test', 'android_tester'],
+      'builder': ['android_dbg_triggered_tests',
+                  'android_fyi_dbg_triggered_tests'],
       'hostname': 'chromeperf%d' % i,
       'os': 'linux',
       'version': 'lucid',
       'bits': '64',
     } for i in (26, 27, 28, 29, 44, 45, 46,
                 50, 51, 52, 53, 54, 55)
   ]
 
   return compile_slaves + test_slaves
 
@@ skipping 112 matching lines @@
       normal_slaves +
       drmemory_slaves +
       chromeframe_slave +
       gpu_slaves +
       swarm_slaves +
       perf_slaves)
 
 
 slaves = filter(in_service,
                 linux() + mac() + windows() + cros() + android() + ios())