Update [dm|nanobench]_flags for CPU/GPU split

tools/nanobench_flags.json

Index: tools/nanobench_flags.json
diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json
index 8a50d255451348f6a62fe06f64880b8238d11c48..28d7b092b939e886a5df6941faa600696ac4c0e3 100644
--- a/tools/nanobench_flags.json
+++ b/tools/nanobench_flags.json
@@ -1,23 +1,4 @@
 {
-  "Perf-Android-GalaxyS3-Mali400-Arm7-Release": [
-    "--scales", 
-    "1.0", 
-    "1.1", 
-    "--config", 
-    "565", 
-    "8888", 
-    "gpu", 
-    "nonrendering", 
-    "angle", 
-    "hwui", 
-    "msaa4", 
-    "nvprmsaa4", 
-    "--match", 
-    "~blurroundrect", 
-    "~patch_grid", 
-    "~desk_carsvg", 
-    "--nocpu"
-  ], 
   "Perf-Android-Nexus7-Tegra3-Arm7-Release": [
     "--scales", 
     "1.0", 
@@ -34,26 +15,7 @@
     "--match", 
     "skp"
   ], 
-  "Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU": [
-    "--scales", 
-    "1.0", 
-    "1.1", 
-    "--config", 
-    "565", 
-    "8888", 
-    "gpu", 
-    "nonrendering", 
-    "angle", 
-    "hwui", 
-    "msaa16", 
-    "nvprmsaa16", 
-    "--loops", 
-    "1", 
-    "--samples", 
-    "1", 
-    "--nocpu"
-  ], 
-  "Test-Ubuntu14-GCE-NoGPU-x86_64-Release-Valgrind_CPU": [
+  "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": [
     "--scales", 
     "1.0", 
     "1.1", 
@@ -69,10 +31,9 @@
     "--loops", 
     "1", 
     "--samples", 
-    "1", 
-    "--nogpu"
+    "1"
   ], 
-  "Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE": [
+  "Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE": [
     "--scales", 
     "1.0", 
     "1.1",