Update libjpeg-turbo to 1.5.1, enable arithmetic decoding

BUG=skia:4710

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

4 files changed, 197 insertions, 194 deletions

diff --git a/DEPS b/DEPS
index 2ed02355b7..4617ca70f1 100644
--- a/DEPS
+++ b/DEPS
@@ -20,7 +20,7 @@ deps = {
   "third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae",
   "third_party/externals/piex"    : "https://android.googlesource.com/platform/external/piex.git@8f540f64b6c170a16fb7e6e52d61819705c1522a",
 
-  "third_party/externals/libjpeg-turbo"             : "https://skia.googlesource.com/third_party/libjpeg-turbo.git@debddedc75850bcdeb8a57258572f48b802a4bb3",
+  "third_party/externals/libjpeg-turbo"             : "https://skia.googlesource.com/third_party/libjpeg-turbo.git@6de58e0d28014caf2fc1370145f22fd6d65f63e3",
   # libjpeg-turbo depends on yasm to compile .asm files
   "third_party/externals/yasm/source/patched-yasm/" : "https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@4671120cd8558ce62ee8672ebf3eb6f5216f909b",
   "third_party/externals/yasm/binaries"             : "https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881",
diff --git a/infra/bots/assets/skimage/VERSION b/infra/bots/assets/skimage/VERSION
index 2edeafb09d..b5045cc404 100644
--- a/infra/bots/assets/skimage/VERSION
+++ b/infra/bots/assets/skimage/VERSION
@@ -1 +1 @@
-20
\ No newline at end of file
+21
\ No newline at end of file
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 06dae667dc..f7cd7720b1 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -3720,7 +3720,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -3769,7 +3769,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -3818,7 +3818,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -3867,7 +3867,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -3916,7 +3916,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -3965,7 +3965,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4014,7 +4014,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4063,7 +4063,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4112,7 +4112,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4161,7 +4161,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4210,7 +4210,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4259,7 +4259,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4308,7 +4308,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4357,7 +4357,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4406,7 +4406,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4455,7 +4455,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4504,7 +4504,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4553,7 +4553,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4602,7 +4602,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4651,7 +4651,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4700,7 +4700,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4749,7 +4749,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4798,7 +4798,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4847,7 +4847,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4896,7 +4896,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4945,7 +4945,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -4994,7 +4994,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5043,7 +5043,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5092,7 +5092,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5141,7 +5141,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5190,7 +5190,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5317,7 +5317,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5365,7 +5365,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5413,7 +5413,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5462,7 +5462,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5511,7 +5511,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5559,7 +5559,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5607,7 +5607,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5655,7 +5655,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5704,7 +5704,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5758,7 +5758,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5812,7 +5812,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5861,7 +5861,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5915,7 +5915,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -5964,7 +5964,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6017,7 +6017,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6070,7 +6070,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6119,7 +6119,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6168,7 +6168,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6217,7 +6217,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6316,7 +6316,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6364,7 +6364,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6412,7 +6412,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6460,7 +6460,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6508,7 +6508,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6566,7 +6566,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6614,7 +6614,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6672,7 +6672,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6720,7 +6720,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6768,7 +6768,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6816,7 +6816,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6864,7 +6864,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6912,7 +6912,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -6960,7 +6960,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7008,7 +7008,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7056,7 +7056,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7104,7 +7104,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7152,7 +7152,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7200,7 +7200,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7248,7 +7248,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7296,7 +7296,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7344,7 +7344,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7392,7 +7392,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7440,7 +7440,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7488,7 +7488,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7536,7 +7536,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7584,7 +7584,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7632,7 +7632,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7680,7 +7680,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7728,7 +7728,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7776,7 +7776,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7824,7 +7824,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7872,7 +7872,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7920,7 +7920,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -7968,7 +7968,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8016,7 +8016,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8064,7 +8064,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8113,7 +8113,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8162,7 +8162,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8211,7 +8211,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8260,7 +8260,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8308,7 +8308,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8356,7 +8356,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8405,7 +8405,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8454,7 +8454,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8503,7 +8503,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8552,7 +8552,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8601,7 +8601,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8650,7 +8650,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8699,7 +8699,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8748,7 +8748,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8797,7 +8797,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8846,7 +8846,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8895,7 +8895,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8944,7 +8944,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -8993,7 +8993,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9042,7 +9042,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9091,7 +9091,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9140,7 +9140,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9189,7 +9189,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9238,7 +9238,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9287,7 +9287,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9336,7 +9336,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9385,7 +9385,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9434,7 +9434,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9483,7 +9483,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9532,7 +9532,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9581,7 +9581,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9630,7 +9630,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9679,7 +9679,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9728,7 +9728,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9777,7 +9777,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9826,7 +9826,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9875,7 +9875,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9924,7 +9924,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -9973,7 +9973,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10022,7 +10022,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10071,7 +10071,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10119,7 +10119,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10167,7 +10167,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10216,7 +10216,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10265,7 +10265,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10313,7 +10313,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10361,7 +10361,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10409,7 +10409,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10458,7 +10458,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10512,7 +10512,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10566,7 +10566,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10615,7 +10615,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10669,7 +10669,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10718,7 +10718,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10772,7 +10772,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10825,7 +10825,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10878,7 +10878,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10931,7 +10931,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -10980,7 +10980,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11104,7 +11104,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11153,7 +11153,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11202,7 +11202,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11251,7 +11251,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11299,7 +11299,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11347,7 +11347,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11395,7 +11395,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11443,7 +11443,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11501,7 +11501,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11549,7 +11549,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11607,7 +11607,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11655,7 +11655,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11703,7 +11703,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11751,7 +11751,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11799,7 +11799,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11847,7 +11847,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11895,7 +11895,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11943,7 +11943,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -11991,7 +11991,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12039,7 +12039,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12087,7 +12087,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12135,7 +12135,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12183,7 +12183,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12231,7 +12231,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12279,7 +12279,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12327,7 +12327,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12375,7 +12375,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12423,7 +12423,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12471,7 +12471,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12519,7 +12519,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12567,7 +12567,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12615,7 +12615,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12663,7 +12663,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12711,7 +12711,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12759,7 +12759,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12807,7 +12807,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12855,7 +12855,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12903,7 +12903,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -12951,7 +12951,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -13000,7 +13000,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -13049,7 +13049,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -13098,7 +13098,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -13147,7 +13147,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -13196,7 +13196,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -13245,7 +13245,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
@@ -13293,7 +13293,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:20"
+          "version": "version:21"
         },
         {
           "name": "skia/bots/skp",
diff --git a/third_party/libjpeg-turbo/BUILD.gn b/third_party/libjpeg-turbo/BUILD.gn
index 6825b6bfee..6254235762 100644
--- a/third_party/libjpeg-turbo/BUILD.gn
+++ b/third_party/libjpeg-turbo/BUILD.gn
@@ -20,8 +20,10 @@ if (skia_use_system_libjpeg_turbo) {
     defines = [ "TURBO_FOR_WINDOWS" ]
 
     sources = [
+      "../externals/libjpeg-turbo/jaricom.c",
       "../externals/libjpeg-turbo/jcapimin.c",
       "../externals/libjpeg-turbo/jcapistd.c",
+      "../externals/libjpeg-turbo/jcarith.c",
       "../externals/libjpeg-turbo/jccoefct.c",
       "../externals/libjpeg-turbo/jccolor.c",
       "../externals/libjpeg-turbo/jcdctmgr.c",
@@ -37,6 +39,7 @@ if (skia_use_system_libjpeg_turbo) {
       "../externals/libjpeg-turbo/jcsample.c",
       "../externals/libjpeg-turbo/jdapimin.c",
       "../externals/libjpeg-turbo/jdapistd.c",
+      "../externals/libjpeg-turbo/jdarith.c",
       "../externals/libjpeg-turbo/jdcoefct.c",
       "../externals/libjpeg-turbo/jdcolor.c",
       "../externals/libjpeg-turbo/jddctmgr.c",