Fix bug handling CMYK images without color profiles

We need the swizzler to convert CMYK->RGB in some
cases where we do have a color xform.

BUG=skia:

Change-Id: Id467ad03df64368fd5a6c3bd5461566582eb492e
Reviewed-on: https://skia-review.googlesource.com/8973
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

2 files changed, 196 insertions, 196 deletions

diff --git a/infra/bots/assets/skimage/VERSION b/infra/bots/assets/skimage/VERSION
index b5045cc404..8fdd954df9 100644
--- a/infra/bots/assets/skimage/VERSION
+++ b/infra/bots/assets/skimage/VERSION
@@ -1 +1 @@
-21
\ No newline at end of file
+22
\ No newline at end of file
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index d7013d25fa..fbbca8dc6b 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -3745,7 +3745,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -3795,7 +3795,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -3845,7 +3845,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -3895,7 +3895,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -3945,7 +3945,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -3995,7 +3995,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4045,7 +4045,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4095,7 +4095,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4145,7 +4145,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4195,7 +4195,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4245,7 +4245,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4295,7 +4295,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4345,7 +4345,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4395,7 +4395,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4445,7 +4445,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4495,7 +4495,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4545,7 +4545,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4595,7 +4595,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4645,7 +4645,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4695,7 +4695,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4745,7 +4745,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4795,7 +4795,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4845,7 +4845,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4895,7 +4895,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4945,7 +4945,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -4995,7 +4995,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5045,7 +5045,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5095,7 +5095,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5145,7 +5145,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5275,7 +5275,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5324,7 +5324,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5373,7 +5373,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5423,7 +5423,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5473,7 +5473,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5522,7 +5522,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5571,7 +5571,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5620,7 +5620,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5670,7 +5670,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5725,7 +5725,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5780,7 +5780,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5830,7 +5830,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5885,7 +5885,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5935,7 +5935,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -5989,7 +5989,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6043,7 +6043,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6093,7 +6093,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6143,7 +6143,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6193,7 +6193,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6293,7 +6293,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6342,7 +6342,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6391,7 +6391,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6440,7 +6440,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6489,7 +6489,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6543,7 +6543,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6602,7 +6602,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6656,7 +6656,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6715,7 +6715,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6764,7 +6764,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6813,7 +6813,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6862,7 +6862,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6911,7 +6911,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -6960,7 +6960,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7009,7 +7009,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7058,7 +7058,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7107,7 +7107,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7156,7 +7156,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7206,7 +7206,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7256,7 +7256,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7305,7 +7305,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7354,7 +7354,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7403,7 +7403,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7452,7 +7452,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7501,7 +7501,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7550,7 +7550,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7599,7 +7599,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7648,7 +7648,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7698,7 +7698,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7748,7 +7748,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7798,7 +7798,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7848,7 +7848,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7898,7 +7898,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7948,7 +7948,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -7997,7 +7997,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8046,7 +8046,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8095,7 +8095,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8144,7 +8144,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8193,7 +8193,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8242,7 +8242,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8292,7 +8292,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8342,7 +8342,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8392,7 +8392,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8442,7 +8442,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8491,7 +8491,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8540,7 +8540,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8590,7 +8590,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8640,7 +8640,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8690,7 +8690,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8740,7 +8740,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8790,7 +8790,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8840,7 +8840,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8890,7 +8890,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8940,7 +8940,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -8990,7 +8990,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9040,7 +9040,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9090,7 +9090,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9140,7 +9140,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9190,7 +9190,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9240,7 +9240,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9290,7 +9290,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9340,7 +9340,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9390,7 +9390,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9440,7 +9440,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9490,7 +9490,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9540,7 +9540,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9590,7 +9590,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9640,7 +9640,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9690,7 +9690,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9740,7 +9740,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9790,7 +9790,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9840,7 +9840,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9890,7 +9890,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9940,7 +9940,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -9990,7 +9990,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10040,7 +10040,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10090,7 +10090,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10140,7 +10140,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10190,7 +10190,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10239,7 +10239,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10288,7 +10288,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10338,7 +10338,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10388,7 +10388,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10437,7 +10437,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10486,7 +10486,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10535,7 +10535,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10585,7 +10585,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10640,7 +10640,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10695,7 +10695,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10745,7 +10745,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10800,7 +10800,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10850,7 +10850,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10905,7 +10905,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -10959,7 +10959,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11013,7 +11013,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11067,7 +11067,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11117,7 +11117,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11242,7 +11242,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11292,7 +11292,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11342,7 +11342,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11392,7 +11392,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11441,7 +11441,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11490,7 +11490,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11539,7 +11539,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11588,7 +11588,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11637,7 +11637,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11691,7 +11691,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11750,7 +11750,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11804,7 +11804,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11863,7 +11863,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11912,7 +11912,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -11961,7 +11961,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12010,7 +12010,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12059,7 +12059,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12108,7 +12108,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12157,7 +12157,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12206,7 +12206,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12255,7 +12255,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12304,7 +12304,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12354,7 +12354,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12404,7 +12404,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12453,7 +12453,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12502,7 +12502,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12551,7 +12551,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12600,7 +12600,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12649,7 +12649,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12698,7 +12698,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12747,7 +12747,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12797,7 +12797,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12847,7 +12847,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12897,7 +12897,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12947,7 +12947,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -12997,7 +12997,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13047,7 +13047,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13096,7 +13096,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13145,7 +13145,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13194,7 +13194,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13243,7 +13243,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13292,7 +13292,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13341,7 +13341,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13391,7 +13391,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13441,7 +13441,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13491,7 +13491,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13541,7 +13541,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13591,7 +13591,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13641,7 +13641,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",
@@ -13690,7 +13690,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:21"
+          "version": "version:22"
         },
         {
           "name": "skia/bots/skp",