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

tools/dm_flags.py

Index: tools/dm_flags.py
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index fb4522c74a1c94b3e0106b18f6a549fb6e81add3..5c22a33d0d718b67cbc89cee418437e0e458dae9 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -50,13 +50,6 @@
       else:
         configs.append('nvprdit16')
 
-  # We want to test the OpenGL config not the GLES config on the X1
-  if 'TegraX1' in bot:
-    configs.remove('gpu')
-    configs.remove('gpusrgb')
-    configs.append('gl')
-    configs.append('glsrgb')
-    
   # 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.
   if ('GalaxyS4'    not in bot and
@@ -268,7 +261,6 @@
     'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE',
     'Test-Mac10.8-Clang-MacMini4.1-CPU-SSE4-x86_64-Release',
     'Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release',
-    'Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Release',
   ]
 
   cov = coverage.coverage()