Revert of Explicit control in tools of ANGLE frontend and backend

infra/bots/recipes/swarm_test.py

 # Copyright 2016 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.
 
 
 # Recipe module for Skia Swarming test.
 
 
 DEPS = [
   'build/file',
@@ skipping 52 matching lines @@
 
   # These are the canonical configs that we would ideally run on all bots. We
   # may opt out or substitute some below for specific bots
   configs = ['8888', 'gpu', 'gpusrgb', 'pdf']
   # Add in either msaa4 or msaa16 to the canonical set of configs to run
   if 'Android' in bot or 'iOS' in bot:
     configs.append('msaa4')
   else:
     configs.append('msaa16')
 
-  if 'ANGLE' in bot:
-    configs.extend(['angle_gl_es2', 'angle_d3d11_es2'])
-
   # With msaa, the S4 crashes and the NP produces a long error stream when we
   # run with MSAA. The Tegra2 and Tegra3 just don't support it. No record of
   # why we're not running msaa on iOS, probably started with gpu config and just
   # haven't tried.
   if ('GalaxyS4'    in bot or
       'NexusPlayer' in bot or
       'Tegra3'      in bot or
       'iOS'         in bot or
       # skia:5792
       'iHD530'      in bot):
@@ skipping 594 matching lines @@
       api.properties(
           buildername=builder,
           mastername='client.skia',
           slavename='skiabot-linux-swarm-000',
           buildnumber=5,
           path_config='kitchen',
           swarm_out_dir='[SWARM_OUT_DIR]',
           revision='abc123',
           **gerrit_kwargs)
   )