Remove android_test trybot type

masters/master.tryserver.chromium/master.cfg

Index: masters/master.tryserver.chromium/master.cfg
diff --git a/masters/master.tryserver.chromium/master.cfg b/masters/master.tryserver.chromium/master.cfg
index 1d251d81aafa4768302ffe5cac1d71ca0729c584..bbe303b4151cee6b66d5526dc3a5515bd19fabab 100644
--- a/masters/master.tryserver.chromium/master.cfg
+++ b/masters/master.tryserver.chromium/master.cfg
@@ -97,8 +97,10 @@ m_win_swarm = swarm_factory.SwarmFactory(
     full_checkout=True)
 
 # GS archive vars
-chromium_android_archive = master_config.GetGSUtilUrl('chromium-android',
-                                                      'android_try_builder')
+android_dbg_archive = master_config.GetGSUtilUrl(
+    'chromium-android', 'android_try_dbg')
+android_fyi_dbg_archive = master_config.GetGSUtilUrl(
+    'chromium-android', 'android_try_fyi_dbg')
 
 def NextJob(builder, requests):
   """Always prioritize commit queue jobs over try jobs."""
@@ -713,31 +715,42 @@ b_android = CreateBuilder(
     builder_name='android',
     annotation_script='src/build/android/buildbot/bb_try_compile.sh')
 
-# Compile and run tests
-b_android_test = CreateBuilder(
+# Compile and zip build, triggers testers
+b_android_dbg = CreateBuilder(
     platform='android',
     target='Debug',
-    builder_name='android_test',
-    annotation_script='src/build/android/buildbot/bb_try_compile_test.sh')
-
-# Compile and zip build, triggers android_tester
-b_android_builder = CreateBuilder(
-    platform='android',
-    target='Debug',
-    builder_name='android_builder',
+    builder_name='android_dbg',
     factory_properties={'trigger': 'android',
-                        'build_url': chromium_android_archive},
+                        'build_url': android_dbg_archive},
     annotation_script='src/build/android/buildbot/bb_try_builder.sh')
 
 # Download and extract build, run tests.
-b_android_tester = CreateBuilder(
+b_android_dbg_triggered_tests = CreateBuilder(
     platform='android',
     target='Debug',
-    builder_name='android_tester',
+    builder_name='android_dbg_triggered_tests',
     factory_properties={'halt_on_missing_build': True,
-                        'build_url': chromium_android_archive},
+                        'build_url': android_dbg_archive},
     annotation_script='src/build/android/buildbot/bb_try_tester.sh')
 
+# Compile and zip build, triggers testers
+b_android_fyi_dbg = CreateBuilder(
+    platform='android',
+    target='Debug',
+    builder_name='android_fyi_dbg',
+    factory_properties={'trigger': 'android_fyi',
+                        'build_url': android_fyi_dbg_archive},
+    annotation_script='src/build/android/buildbot/bb_try_fyi_builder.sh')
+
+# Download and extract build, run tests.
+b_android_fyi_dbg_triggered_tests = CreateBuilder(
+    platform='android',
+    target='Debug',
+    builder_name='android_fyi_dbg_triggered_tests',
+    factory_properties={'halt_on_missing_build': True,
+                        'build_url': android_fyi_dbg_archive},
+    annotation_script='src/build/android/buildbot/bb_try_fyi_tester.sh')
+
 b_ios_rel_device = CreateBuilder(
   platform='ios',
   builder_name='ios_rel_device',
@@ -1623,7 +1636,8 @@ c['builders'] = [
   b_linux_rel_naclmore, b_mac_rel_naclmore, b_win_rel_naclmore,
   b_linux_clang,
   b_linux, b_mac, b_win,
-  b_android, b_android_test, b_android_builder, b_android_tester,
+  b_android, b_android_dbg, b_android_dbg_triggered_tests,
+  b_android_fyi_dbg, b_android_fyi_dbg_triggered_tests,
   b_ios_rel_device, b_ios_dbg_simulator,
   b_win_vs2010_rel, b_win_vs2010,
   b_chromium_chromiumos,
@@ -1709,10 +1723,13 @@ if LISTEN_TO_SVN:
       code_review_sites=code_review_sites,
       pools=pools))
 
-# Triggerable scheduler for Android Builder.
+# Triggerable schedulers for Android Builder.
 c['schedulers'].append(Triggerable(
     name='android',
-    builderNames=['android_tester']))
+    builderNames=['android_dbg_triggered_tests']))
+c['schedulers'].append(Triggerable(
+    name='android_fyi',
+    builderNames=['android_fyi_dbg_triggered_tests']))
 
 
 ####### STATUS TARGETS