Revert of [Skia] Convert Sk Images to a CIPD package

scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json

 [
   {
     "cmd": [
       "git",
       "remote",
       "set-url",
       "origin",
       "https://skia.googlesource.com/skia.git"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
@@ skipping 697 matching lines @@
       "[SLAVE_BUILD]/skia/SKP_VERSION",
       "/path/to/tmp/"
     ],
     "name": "Get expected SKP_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",
+      "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
       "/path/to/tmp/"
     ],
-    "name": "read skimage VERSION"
+    "name": "Get downloaded SK_IMAGE_VERSION"
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+      "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
+      "/path/to/tmp/"
+    ],
+    "name": "Get expected SK_IMAGE_VERSION"
+  },
+  {
+    "cmd": [
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
       "[SLAVE_BUILD]/swarming_temp_dir",
       "511"
     ],
     "name": "makedirs swarming tmp dir (3)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
@@ skipping 123 matching lines @@
       "--tag",
       "master:client.skia",
       "--tag",
       "name:test_skia",
       "--tag",
       "os:Ubuntu",
       "--tag",
       "slavename:skiabot-linux-swarm-000",
       "--tag",
       "stepname:test_skia on Ubuntu",
-      "--cipd-package",
-      "skimage:skia/bots/skimage:version:0",
       "def456",
       "--",
       "--workdir",
       "../../..",
       "skia/swarm_test",
       "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
       "mastername=client.skia",
       "buildnumber=5",
       "slavename=skiabot-linux-swarm-000",
       "reason=Triggered by Skia swarm_trigger Recipe",
@@ skipping 154 matching lines @@
       "--tag",
       "master:client.skia",
       "--tag",
       "name:perf_skia",
       "--tag",
       "os:Ubuntu",
       "--tag",
       "slavename:skiabot-linux-swarm-000",
       "--tag",
       "stepname:perf_skia on Ubuntu",
-      "--cipd-package",
-      "skimage:skia/bots/skimage:version:0",
       "def456",
       "--",
       "--workdir",
       "../../..",
       "skia/swarm_perf",
       "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
       "mastername=client.skia",
       "buildnumber=5",
       "slavename=skiabot-linux-swarm-000",
       "reason=Triggered by Skia swarm_trigger Recipe",
@@ skipping 224 matching lines @@
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0 isolated out@blah@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]