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

tools/nanobench_flags.json

Index: tools/nanobench_flags.json
diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json
index 975ddb2c27d351ef1a8356c118a2d20666678d95..767639cd5b73e7bc68cf96107b9a624af0e483a0 100644
--- a/tools/nanobench_flags.json
+++ b/tools/nanobench_flags.json
@@ -17,8 +17,7 @@
     "angle", 
     "hwui", 
     "msaa4", 
-    "nvpr4", 
-    "nvprdit4", 
+    "nvprmsaa4", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid", 
@@ -44,7 +43,7 @@
     "~inc0.webp", 
     "~inc1.webp"
   ], 
-  "Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Release": [
+  "Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release": [
     "--pre_log", 
     "--images", 
     "--gpuStatsDump", 
@@ -57,57 +56,12 @@
     "--config", 
     "565", 
     "8888", 
-    "nonrendering", 
-    "angle", 
-    "hwui", 
-    "gl", 
-    "glmsaa4", 
-    "glnvpr4", 
-    "glnvprdit4", 
-    "--match", 
-    "~blurroundrect", 
-    "~patch_grid", 
-    "~desk_carsvg", 
-    "~inc0.gif", 
-    "~inc1.gif", 
-    "~incInterlaced.gif", 
-    "~inc0.jpg", 
-    "~incGray.jpg", 
-    "~inc0.wbmp", 
-    "~inc1.wbmp", 
-    "~inc0.webp", 
-    "~inc1.webp", 
-    "~inc0.ico", 
-    "~inc1.ico", 
-    "~inc0.png", 
-    "~inc1.png", 
-    "~inc2.png", 
-    "~inc12.png", 
-    "~inc13.png", 
-    "~inc14.png", 
-    "~inc0.webp", 
-    "~inc1.webp"
-  ], 
-  "Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release": [
-    "--pre_log", 
-    "--images", 
-    "--gpuStatsDump", 
-    "true", 
-    "--useThermalManager", 
-    "1,1,10,1000", 
-    "--scales", 
-    "1.0", 
-    "1.1", 
-    "--config", 
-    "565", 
-    "8888", 
     "gpu", 
     "nonrendering", 
     "angle", 
     "hwui", 
     "msaa4", 
-    "nvpr4", 
-    "nvprdit4", 
+    "nvprmsaa4", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid", 
@@ -190,8 +144,7 @@
     "angle", 
     "hwui", 
     "msaa4", 
-    "nvpr4", 
-    "nvprdit4", 
+    "nvprmsaa4", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid", 
@@ -271,8 +224,7 @@
     "angle", 
     "hwui", 
     "msaa16", 
-    "nvpr16", 
-    "nvprdit16", 
+    "nvprmsaa16", 
     "--match", 
     "nothing_will_match_this"
   ], 
@@ -292,8 +244,7 @@
     "angle", 
     "hwui", 
     "msaa16", 
-    "nvpr16", 
-    "nvprdit16", 
+    "nvprmsaa16", 
     "--loops", 
     "1", 
     "--samples", 
@@ -340,8 +291,7 @@
     "angle", 
     "hwui", 
     "msaa16", 
-    "nvpr16", 
-    "nvprdit16", 
+    "nvprmsaa16", 
     "--GPUbenchTileW", 
     "256", 
     "--GPUbenchTileH", 
@@ -390,8 +340,7 @@
     "angle", 
     "hwui", 
     "msaa16", 
-    "nvpr16", 
-    "nvprdit16", 
+    "nvprmsaa16", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid",