Revert of Add predfined configs for msaa4, nvpr4, nvpr4dit, and srgb that explictly use OpenGL rather than GL…

tools/nanobench_flags.py

Index: tools/nanobench_flags.py
diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index b14251ed8578e0aee011c577fd0425597f10f4cb..02b885634e9c40a99703a1afc9c793eae7f0403b 100755
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -49,13 +49,7 @@
     if ('GalaxyS4'    not in bot and
         'NexusPlayer' not in bot):
       if 'Android' in bot:
-        # The TegraX1 has a regular OpenGL implementation. We bench that instead
-        # of ES.
-        if 'TegraX1' in bot:
-          config.remove('gpu')
-          config.extend(['gl', 'glmsaa4', 'glnvpr4', 'glnvprdit4'])
-        else:
-          config.extend(['msaa4', 'nvpr4', 'nvprdit4'])
+        config.extend(['msaa4', 'nvpr4', 'nvprdit4'])
       else:
         config.extend(['msaa16', 'nvpr16', 'nvprdit16'])
     args.append('--config')
@@ -156,7 +150,6 @@
     'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
     'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release',
     'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot',
-    'Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Release',
   ]
 
   cov = coverage.coverage()