Manually roll Skia and update job names

Bug: skia:9438
Change-Id: Iddd0e497aed3b50b3ccd9fe7b74b25cea3116e77
Reviewed-on: https://skia-review.googlesource.com/c/lottie-ci/+/281197
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/DEPS b/DEPS
index 2bc84c1..da4bae3 100644
--- a/DEPS
+++ b/DEPS
@@ -3,7 +3,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Lottie
   # and whatever else without interference from each other.
-  'lottie_revision': '1d266d29b950cbfd9789d6d055cbdea606aa9e22',
+  'lottie_revision': 'e6ea3f1f40c0c6995dfd4642bd60733600b1af2f',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
@@ -11,7 +11,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'afbf2aa737c8f0b48dfa28c88c51f56a46d32843',
+  'skia_revision': 'b41a420ed8dbb11cdc076c5b06537538591a88e0',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
diff --git a/go.sum b/go.sum
index 2caf118..234b52c 100644
--- a/go.sum
+++ b/go.sum
@@ -1068,6 +1068,8 @@
 go.chromium.org/luci v0.0.0-20200403183213-e517a9b0f117/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
 go.chromium.org/luci v0.0.0-20200404154724-e4db1f789597 h1:PoWzPaIbI2qi6JtKmIpP7TASxPOZGZv/lS9D3FYuZCE=
 go.chromium.org/luci v0.0.0-20200404154724-e4db1f789597/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
+go.chromium.org/luci v0.0.0-20200407040627-351da67d29e3 h1:CpYRaugotz12b0twULjaZwppOqn3NyoykGoPkI1xEcg=
+go.chromium.org/luci v0.0.0-20200407040627-351da67d29e3/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
@@ -1329,6 +1331,8 @@
 go.skia.org/infra v0.0.0-20200405010037-f60454fef23a/go.mod h1:o/kEz0vq/9uGXZZ20uy7NmhzlY31leT1Qjt5ipowizE=
 go.skia.org/infra v0.0.0-20200405052407-0bbb2dba381b h1:Q16SXALEsJkd4mM7W29GbXt77kzsaXyD5RcSbf5WxBY=
 go.skia.org/infra v0.0.0-20200405052407-0bbb2dba381b/go.mod h1:1TsGdyibmqMb0proo3XcEo5DEXAemUho2lzqMIsJPEQ=
+go.skia.org/infra v0.0.0-20200406214139-863307386d6d h1:N8neBhxT3P/WIcV29Eo20eKw5DGCNnshpH90JdRI2m4=
+go.skia.org/infra v0.0.0-20200406214139-863307386d6d/go.mod h1:1TsGdyibmqMb0proo3XcEo5DEXAemUho2lzqMIsJPEQ=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
@@ -1369,6 +1373,7 @@
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200403201458-baeed622b8d8/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200406173513-056763e48d71/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1643,6 +1648,8 @@
 golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200406155108-e3b113bbe6a4 h1:c1Sgqkh8v6ZxafNGG64r8C8UisIW2TKMJN8P86tKjr0=
+golang.org/x/sys v0.0.0-20200406155108-e3b113bbe6a4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1819,6 +1826,7 @@
 golang.org/x/tools v0.0.0-20200401192744-099440627f01/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200402223321-bcf690261a44/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200403190813-44a64ad78b9b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200406213809-066fd1390ee0/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools/gopls v0.1.3/go.mod h1:vrCQzOKxvuiZLjCKSmbbov04oeBQQOb4VQqwYK2PWIY=
 golang.org/x/tools/gopls v0.1.5/go.mod h1:ewacT0SpHccpfiFZFLB/R0sJKMz1HugGF8dhdrH1MNQ=
 golang.org/x/tools/gopls v0.1.6/go.mod h1:CB265kVlsa2ImPBrm+Kq0g5/l1XJHprToVr2xciXTT4=
@@ -1962,6 +1970,8 @@
 google.golang.org/genproto v0.0.0-20200402124713-8ff61da6d932/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200403120447-c50568487044 h1:112OPFAnKD+XtZhdffFnz17dEbiCTCKfnNQCAWmwFzA=
 google.golang.org/genproto v0.0.0-20200403120447-c50568487044/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200406120821-33397c535dc2 h1:KlOjjpQjL4dqscfbhtQvAnRMm5PaRTchHHczffkUiq0=
+google.golang.org/genproto v0.0.0-20200406120821-33397c535dc2/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1986,6 +1996,8 @@
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k=
+google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 5132001..ddebfcd 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -1,8 +1,8 @@
 [
-  "Build-Debian9-Clang-x86_64-Release-Lottie",
+  "Build-Debian10-Clang-x86_64-Release-Lottie",
   "Housekeeper-PerCommit-BundleRecipes",
   "Housekeeper-PerCommit-InfraTests",
   "Housekeeper-OnDemand-Presubmit",
-  "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie",
-  "Test-Debian9-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb"
+  "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie",
+  "Test-Debian10-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb"
 ]
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 39e467d..43da5df 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -1,8 +1,8 @@
 {
   "jobs": {
-    "Build-Debian9-Clang-x86_64-Release-Lottie": {
+    "Build-Debian10-Clang-x86_64-Release-Lottie": {
       "tasks": [
-        "Build-Debian9-Clang-x86_64-Release-Lottie"
+        "Build-Debian10-Clang-x86_64-Release-Lottie"
       ]
     },
     "Housekeeper-OnDemand-Presubmit": {
@@ -22,19 +22,19 @@
         "Housekeeper-PerCommit-InfraTests"
       ]
     },
-    "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie": {
       "tasks": [
-        "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie"
+        "Upload-Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie"
       ]
     },
-    "Test-Debian9-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb": {
+    "Test-Debian10-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb": {
       "tasks": [
-        "Upload-Test-Debian9-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb"
+        "Upload-Test-Debian10-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb"
       ]
     }
   },
   "tasks": {
-    "Build-Debian9-Clang-x86_64-Release-Lottie": {
+    "Build-Debian10-Clang-x86_64-Release-Lottie": {
       "caches": [
         {
           "name": "ccache",
@@ -78,7 +78,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Release-Lottie\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian10-Clang-x86_64-Release-Lottie\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -88,7 +88,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian-10.3",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -178,7 +178,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highcpu-64",
-        "os:Debian-9.8",
+        "os:Debian-10.3",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -236,7 +236,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian-10.3",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -329,7 +329,7 @@
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian-10.3",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -351,7 +351,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie": {
       "caches": [
         {
           "name": "vpython",
@@ -401,17 +401,17 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Lottie\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian9\\\",\\\"renderer\\\",\\\"skottie\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"lottie\\\",\\\"--blacklist\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-gold-lottie/hash_files/gold-lottie-hashes.txt\",\"lotties\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Lottie\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"renderer\\\",\\\"skottie\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"lottie\\\",\\\"--blacklist\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-gold-lottie/hash_files/gold-lottie-hashes.txt\",\"lotties\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian9-Clang-x86_64-Release-Lottie",
+        "Build-Debian10-Clang-x86_64-Release-Lottie",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian-10.3",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -435,7 +435,7 @@
         "test"
       ]
     },
-    "Test-Debian9-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb": {
+    "Test-Debian10-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb": {
       "caches": [
         {
           "name": "vpython",
@@ -470,7 +470,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test_lottie_web",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-gold-lottie/hash_files/gold-lottie-hashes.txt\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-gold-lottie/hash_files/gold-lottie-hashes.txt\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -479,7 +479,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "machine_type:n1-standard-16",
-        "os:Debian-9.8",
+        "os:Debian-10.3",
         "pool:Skia",
         "docker_installed:true"
       ],
@@ -504,7 +504,7 @@
         "test"
       ]
     },
-    "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie": {
+    "Upload-Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie": {
       "caches": [
         {
           "name": "vpython",
@@ -539,18 +539,18 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_dm_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie\",\"gs_bucket\":\"skia-gold-lottie\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie\",\"gs_bucket\":\"skia-gold-lottie\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie"
+        "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian-10.3",
         "pool:Skia"
       ],
       "env_prefixes": {
@@ -571,7 +571,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Test-Debian9-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb": {
+    "Upload-Test-Debian10-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb": {
       "caches": [
         {
           "name": "vpython",
@@ -606,18 +606,18 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_dm_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb\",\"gs_bucket\":\"skia-gold-lottie\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb\",\"gs_bucket\":\"skia-gold-lottie\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Test-Debian9-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb"
+        "Test-Debian10-none-GCE-CPU-AVX2-x86_64-Release-All-LottieWeb"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
         "machine_type:n1-highmem-2",
-        "os:Debian-9.8",
+        "os:Debian-10.3",
         "pool:Skia"
       ],
       "env_prefixes": {