Stop testing builds with runtime-detected NEON

O frabjous day!

Chrome has switched on requiring NEON globally at head.
Android has always built with NEON as appropriate for each device.

In practice, this switches our Nexus 5 bots from runtime-detected to
building with NEON globally.  It also lines a few columns up and makes
equivalent aliases more obviously the same.

We still have Build bots to test we can build on ARMv7 with no NEON.  (We even have Build bots to test building ARMv6.)

(It looks like that buildbot_spec.json just hasn't been updated in a while.)

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

CQ_EXTRA_TRYBOTS=client.skia.android:Perf-Android-GCC-Nexus5-CPU-NEON-Arm7-Release-Trybot,Test-Android-GCC-Nexus5-CPU-NEON-Arm7-Debug-Trybot,Test-Android-GCC-Nexus5-CPU-NEON-Arm7-Release-Trybot

Review URL: https://codereview.chromium.org/1612753002
diff --git a/tools/buildbot_spec.json b/tools/buildbot_spec.json
index 5aea202..9f7780b 100644
--- a/tools/buildbot_spec.json
+++ b/tools/buildbot_spec.json
@@ -22,7 +22,7 @@
       "msaa4", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -179,7 +179,191 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png"
+      "inc14.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -251,7 +435,7 @@
       "msaa4", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -404,7 +588,191 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png"
+      "inc14.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -474,7 +842,7 @@
       "msaa4", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -627,7 +995,191 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png"
+      "inc14.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -704,7 +1256,7 @@
       "msaa16", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -857,7 +1409,191 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png"
+      "inc14.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -933,7 +1669,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -1098,7 +1834,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -1176,7 +2096,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "angle", 
       "--src", 
       "tests", 
@@ -1342,7 +2262,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -1420,7 +2524,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -1585,7 +2689,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -1662,7 +2950,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -1831,7 +3119,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -1909,7 +3381,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -2078,7 +3550,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -2156,7 +3812,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -2325,7 +3981,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -2399,7 +4239,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -2552,7 +4392,191 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png"
+      "inc14.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -2613,7 +4637,7 @@
       "role": "Perf"
     }, 
     "configuration": "Release", 
-    "device_cfg": "arm_v7", 
+    "device_cfg": "arm_v7_neon", 
     "dm_flags": [
       "--config", 
       "565", 
@@ -2622,7 +4646,7 @@
       "msaa4", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -2774,7 +4798,191 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png"
+      "inc14.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": true, 
     "do_test_steps": false, 
@@ -2847,7 +5055,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -3011,7 +5219,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": true, 
     "do_test_steps": false, 
@@ -3094,7 +5486,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -3262,7 +5654,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": true, 
     "do_test_steps": false, 
@@ -3336,7 +5912,7 @@
       "gpu", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -3491,6 +6067,190 @@
       "image", 
       "decode", 
       "inc14.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
       "--match", 
       "~imagefiltersclipped", 
       "~imagefilterscropexpand", 
@@ -3571,7 +6331,7 @@
       "msaa4", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -3723,7 +6483,191 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png"
+      "inc14.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": true, 
     "do_test_steps": true, 
@@ -3808,7 +6752,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -3973,7 +6917,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": true, 
     "do_test_steps": true, 
@@ -4053,7 +7181,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -4221,7 +7349,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -4302,6 +7614,8 @@
       "upright-matrix-8888", 
       "upright-matrix-gpu", 
       "sp-8888", 
+      "twice-8888", 
+      "2ndpic-8888", 
       "remote-8888", 
       "remote_cache-8888", 
       "msaa16", 
@@ -4309,7 +7623,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -4474,7 +7788,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -4553,6 +8051,8 @@
       "upright-matrix-8888", 
       "upright-matrix-gpu", 
       "sp-8888", 
+      "twice-8888", 
+      "2ndpic-8888", 
       "remote-8888", 
       "remote_cache-8888", 
       "msaa16", 
@@ -4560,7 +8060,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -4725,7 +8225,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -4803,6 +8487,8 @@
       "upright-matrix-8888", 
       "upright-matrix-gpu", 
       "sp-8888", 
+      "twice-8888", 
+      "2ndpic-8888", 
       "remote-8888", 
       "remote_cache-8888", 
       "msaa16", 
@@ -4810,7 +8496,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -4975,7 +8661,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -5053,6 +8923,8 @@
       "upright-matrix-8888", 
       "upright-matrix-gpu", 
       "sp-8888", 
+      "twice-8888", 
+      "2ndpic-8888", 
       "remote-8888", 
       "remote_cache-8888", 
       "msaa16", 
@@ -5060,7 +8932,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -5225,7 +9097,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -5308,7 +9364,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -5462,10 +9518,6 @@
       "decode", 
       "inc14.png", 
       "pdf", 
-      "_", 
-      "_", 
-      ".webp", 
-      "pdf", 
       "gm", 
       "_", 
       "fontmgr_iter", 
@@ -5497,6 +9549,190 @@
       "image", 
       "_", 
       "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
       "--match", 
       "~Threaded"
     ], 
@@ -5525,6 +9761,8 @@
       "1", 
       "--samples", 
       "1", 
+      "--keepAlive", 
+      "true", 
       "--match", 
       "~interlaced1.png", 
       "~interlaced2.png", 
@@ -5585,7 +9823,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -5754,7 +9992,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -5835,7 +10257,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "angle", 
       "--src", 
       "tests", 
@@ -6004,7 +10426,191 @@
       "_", 
       "image", 
       "_", 
-      "interlaced3.png"
+      "interlaced3.png", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -6086,7 +10692,7 @@
       "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
-      "pipe-8888", 
+      "pic-8888", 
       "--src", 
       "tests", 
       "gm", 
@@ -6259,8 +10865,190 @@
       "gm", 
       "_", 
       "tilemodesProcess", 
-      "--match", 
-      "~WritePixels"
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "not_native32_bitmap_config", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "bleed_alpha_image_shader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "c_gms", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colortype_xfermodes", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "colorwheelnative", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_0.75_0", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds_1_-0.25", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_bounds", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_match", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "fontmgr_iter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "lightingshader", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "localmatriximagefilter", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylargebitmap", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "verylarge_picture_image", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "blend", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "drawfilter", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "path_stroke_with_zero_length", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "textblobgeometrychange", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "patch_primitive", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-picture", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-raster", 
+      "sp-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "pic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "2ndpic-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable", 
+      "serialize-8888", 
+      "gm", 
+      "_", 
+      "image-cacherator-from-ctable"
     ], 
     "do_perf_steps": true, 
     "do_test_steps": true,