Revert of Add a CQ tester (which will start as experimental) with N5's on L.

masters/master.tryserver.chromium.linux/master.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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 import os
@@ skipping 61 matching lines @@
     'factory': m_annotator.BaseFactory('android/tester'),
     # Share build directory with compatible existing builders to save space.
     'slavebuilddir': 'android',
 }
 
 b_android_compile_dbg = {
   'name': 'android_compile_dbg',
   'factory': m_annotator.BaseFactory('chromium_trybot'),
 }
 
-# combined builder/tester android recipes
-b_android_n5_rel_tests_recipe = {
-    'name': 'android_n5_rel_tests_recipe',
-    'factory': m_annotator.BaseFactory('android/tester'),
-    # Share build directory with compatible existing builders to save space.
-    'slavebuilddir': 'android',
-}
-
 b_android_compile_rel = {
   'name': 'android_compile_rel',
   'factory': m_annotator.BaseFactory('chromium_trybot'),
 }
 
 b_android_rel_tests_recipe = {
     'name': 'android_rel_tests_recipe',
     'factory': m_annotator.BaseFactory('android/tester'),
     # Share build directory with compatible existing builders to save space.
     'slavebuilddir': 'android',
@@ skipping 319 matching lines @@
     'factory': m_annotator.BaseFactory('run_presubmit', {'repo_name': name}),
   }
 
 b_chromium_presubmit = presubmit('chromium', slavebuilddir='linux')
 b_tools_build_presubmit = presubmit('tools_build')
 
 
 c['builders'] = [
   b_android_compile_dbg,
   b_android_compile_rel,
-  b_android_dbg_tests_recipe, b_android_n5_rel_tests_recipe,
-  b_android_arm64_dbg_recipe,
+  b_android_dbg_tests_recipe, b_android_arm64_dbg_recipe,
   b_android_fyi_dbg_tests_recipe,
   b_android_x86_dbg_recipe,
   b_android_clang_dbg_recipe,
   b_android_rel_tests_recipe,
   b_android_amp_rel_tests_recipe,
   b_android_aosp,
   b_linux_clang_tsan,
   b_linux_chromium_asan_rel,
   b_linux_chromium_asan_rel_ng,
   b_linux_full_bisect_builder,
@@ skipping 158 matching lines @@
 #  base.make_stop_form = hack_stop(base.make_stop_form)
 
 
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # vi: set ts=4 sts=2 sw=2 et: