Use android_dbg_tests_recipe for manual try jobs instead of android_dbg & android_dbg_triggered_…

PRESUBMIT.py

 # 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.
 
 """Top-level presubmit script for Chromium.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
 
@@ skipping 1477 matching lines @@
       # TODO(maruel): Figure out a way to run 'sizes' where people can
       # effectively update the perf expectation correctly.  This requires a
       # clobber=True build running 'sizes'. 'sizes' is not accurate with
       # incremental build. Reference:
       # http://chromium.org/developers/tree-sheriffs/perf-sheriffs.
       # TODO(maruel): An option would be to run 'sizes' but not count a failure
       # of this step as a try job failure.
       'android_aosp': ['compile'],
       'android_chromium_gn_compile_rel': ['compile'],
       'android_clang_dbg': ['slave_steps'],
-      'android_dbg': ['slave_steps'],
+      'android_dbg_tests_recipe': ['slave_steps'],
       'cros_x86': ['defaulttests'],
       'ios_dbg_simulator': [
           'compile',
           'base_unittests',
           'content_unittests',
           'crypto_unittests',
           'url_unittests',
           'net_unittests',
           'sql_unittests',
           'ui_unittests',
@@ skipping 72 matching lines @@
     ])
   if all(re.search('(^|[/_])win[/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'win_chromium_dbg',
         'win_chromium_rel_swarming',
     ])
   if all(re.search('(^|[/_])android[/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'android_aosp',
         'android_clang_dbg',
-        'android_dbg',
+        'android_dbg_tests_recipe',
     ])
   if all(re.search('[/_]ios[/_.]', f) for f in files):
     return GetDefaultTryConfigs(['ios_rel_device', 'ios_dbg_simulator'])
 
   builders = [
       'android_chromium_gn_compile_rel',
       'android_clang_dbg',
-      'android_dbg',
+      'android_dbg_tests_recipe',
       'ios_dbg_simulator',
       'ios_rel_device',
       'linux_chromium_chromeos_rel_swarming',
       'linux_chromium_clang_dbg',
       'linux_chromium_gn_rel',
       'linux_chromium_rel_swarming',
       'linux_gpu',
       'mac_chromium_compile_dbg',
       'mac_chromium_rel_swarming',
       'mac_gpu',
@@ skipping 20 matching lines @@
     builders.extend(['cros_x86'])
 
   # The AOSP bot doesn't build the chrome/ layer, so ignore any changes to it
   # unless they're .gyp(i) files as changes to those files can break the gyp
   # step on that bot.
   if (not all(re.search('^chrome', f) for f in files) or
       any(re.search('\.gypi?$', f) for f in files)):
     builders.extend(['android_aosp'])
 
   return GetDefaultTryConfigs(builders)