nanobench: turn on f16 and sRGB on the bots

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1769163006

Review URL: https://codereview.chromium.org/1769163006
diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json
index 2eaa3b7..bdf7cf1 100644
--- a/tools/nanobench_flags.json
+++ b/tools/nanobench_flags.json
@@ -16,6 +16,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "srgb", 
+    "f16", 
     "msaa4", 
     "nvprmsaa4", 
     "--match", 
@@ -59,6 +61,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "srgb", 
+    "f16", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid", 
@@ -99,6 +103,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "srgb", 
+    "f16", 
     "msaa4", 
     "nvprmsaa4", 
     "--match", 
@@ -142,6 +148,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "srgb", 
+    "f16", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid", 
@@ -179,6 +187,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "srgb", 
+    "f16", 
     "msaa16", 
     "nvprmsaa16", 
     "--match", 
@@ -199,6 +209,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "srgb", 
+    "f16", 
     "msaa16", 
     "nvprmsaa16", 
     "--loops", 
@@ -246,6 +258,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "srgb", 
+    "f16", 
     "msaa16", 
     "nvprmsaa16", 
     "--GPUbenchTileW", 
@@ -295,6 +309,8 @@
     "nonrendering", 
     "angle", 
     "hwui", 
+    "srgb", 
+    "f16", 
     "msaa16", 
     "nvprmsaa16", 
     "--match", 
diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index 451cd55..a2ce167 100755
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -44,6 +44,7 @@
 
   if 'Appurify' not in bot:
     config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
+    config.extend(['srgb', 'f16'])
     # The S4 crashes and the NP produces a long error stream when we run with
     # MSAA.
     if ('GalaxyS4'    not in bot and