Use SVGs CIPD package and use SVG as a DM source

infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json

 [
   {
     "cmd": [
       "which",
       "adb"
     ],
     "name": "which adb",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
@@ skipping 213 matching lines @@
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "read SKP_VERSION",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+      "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION",
+      "/path/to/tmp/"
+    ],
+    "name": "Get downloaded skimage VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+      "42",
+      "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION"
+    ],
+    "name": "write SK_IMAGE_VERSION"
+  },
+  {
+    "cmd": [
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
+      "shell",
+      "cat",
+      "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
+    ],
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "SKIA_OUT": "[SLAVE_BUILD]/out"
+    },
+    "name": "read SK_IMAGE_VERSION",
+    "stdout": "/path/to/tmp/"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+      "[SLAVE_BUILD]/skia/infra/bots/assets/svg/VERSION",
+      "/path/to/tmp/"
+    ],
+    "name": "Get downloaded SVG VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+      "42",
+      "[SLAVE_BUILD]/tmp/SVG_VERSION"
+    ],
+    "name": "write SVG_VERSION"
+  },
+  {
+    "cmd": [
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
+      "shell",
+      "cat",
+      "/storage/emulated/legacy/skiabot/skia_tmp_dir/SVG_VERSION"
+    ],
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "SKIA_OUT": "[SLAVE_BUILD]/out"
+    },
+    "name": "read SVG_VERSION",
+    "stdout": "/path/to/tmp/"
+  },
+  {
+    "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "rm",
       "-f",
-      "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
+      "/storage/emulated/legacy/skiabot/skia_tmp_dir/SVG_VERSION"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
-    "name": "rm SKP_VERSION"
+    "name": "rm SVG_VERSION"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "rm",
       "-r",
-      "/storage/emulated/legacy/skiabot/skia_skp/skps"
+      "/storage/emulated/legacy/skiabot/skia_svg/svgs"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
-    "name": "rmdir skps"
+    "name": "rmdir svgs"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "if",
       "[",
       "-e",
-      "/storage/emulated/legacy/skiabot/skia_skp/skps",
+      "/storage/emulated/legacy/skiabot/skia_svg/svgs",
       "];",
       "then",
       "echo",
       "FILE_EXISTS;",
       "fi"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
-    "name": "exists skps",
+    "name": "exists svgs",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "mkdir",
       "-p",
-      "/storage/emulated/legacy/skiabot/skia_skp/skps"
+      "/storage/emulated/legacy/skiabot/skia_svg/svgs"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
-    "name": "mkdir skps"
+    "name": "mkdir svgs"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed",
       "--verbose",
-      "[SLAVE_BUILD]/skp",
-      "/storage/emulated/legacy/skiabot/skia_skp/skps"
+      "[SLAVE_BUILD]/svg",
+      "/storage/emulated/legacy/skiabot/skia_svg/svgs"
     ],
     "env": {
       "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
-    "name": "push skp"
+    "name": "push svg"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "push",
-      "[SLAVE_BUILD]/tmp/SKP_VERSION",
-      "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
+      "[SLAVE_BUILD]/tmp/SVG_VERSION",
+      "/storage/emulated/legacy/skiabot/skia_tmp_dir/SVG_VERSION"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
-    "name": "push SKP_VERSION"
+    "name": "push SVG_VERSION"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION",
-      "/path/to/tmp/"
-    ],
-    "name": "Get downloaded skimage VERSION"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "42",
-      "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION"
-    ],
-    "name": "write SK_IMAGE_VERSION"
-  },
-  {
-    "cmd": [
-      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
-      "shell",
-      "cat",
-      "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
-    ],
-    "env": {
-      "BUILDTYPE": "Debug",
-      "CHROME_HEADLESS": "1",
-      "SKIA_OUT": "[SLAVE_BUILD]/out"
-    },
-    "name": "read SK_IMAGE_VERSION",
-    "stdout": "/path/to/tmp/"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
       "[CUSTOM_[SWARM_OUT_DIR]]/dm"
     ],
     "env": {
       "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
     },
     "name": "rmtree dm",
     "~followup_annotations": [
@@ skipping 621 matching lines @@
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "kill-server"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]