Revert of Explicit control in tools of ANGLE frontend and backend

infra/bots/recipes/swarm_perf.py

Index: infra/bots/recipes/swarm_perf.py
diff --git a/infra/bots/recipes/swarm_perf.py b/infra/bots/recipes/swarm_perf.py
index a7148b06d81353d17f3dbb202f52729b132967c7..fb8838c047f227a86730b2f43e0dc4b913a31d83 100644
--- a/infra/bots/recipes/swarm_perf.py
+++ b/infra/bots/recipes/swarm_perf.py
@@ -38,7 +38,6 @@
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug',
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release',
       'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
-      'Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE',
       'Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
     ],
   },
@@ -63,7 +62,7 @@
   if 'iOS' in bot:
     args.extend(['--skps', 'ignore_skps'])
 
-  config = ['8888', 'gpu', 'nonrendering', 'hwui' ]
+  config = ['8888', 'gpu', 'nonrendering', 'angle', 'hwui' ]
   if 'AndroidOne' not in bot:
     config += [ 'f16', 'srgb' ]
   if '-GCE-' in bot:
@@ -95,9 +94,6 @@
     config = ['commandbuffer']
   if 'Vulkan' in bot:
     config = ['vk']
-
-  if 'ANGLE' in bot:
-    config.extend(['angle_gl_es2', 'angle_d3d11_es2'])
 
   args.append('--config')
   args.extend(config)