Revert "Add CIPD package support to swarming recipe api"

scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___swarming_staging.json

Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___swarming_staging.json
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___swarming_staging.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___swarming_staging.json
index c678cb17806375aab373ab22c54488f4ecbc65c0..c690fd536be9aa98b4248a3dea25cb4bbf543b2d 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___swarming_staging.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___swarming_staging.json
@@ -74,7 +74,7 @@
     "name": "swarming.py --version",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
-      "@@@STEP_TEXT@0.8.6@@@"
+      "@@@STEP_TEXT@0.4.10@@@"
     ]
   },
   {
@@ -892,8 +892,9 @@
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
-      "--json",
-      "{\"base_task_name\": \"Static-Initializers/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\", \"tasks\": {\"Static-Initializers/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "--shards",
+      "1",
+      "Static-Initializers/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],
@@ -959,8 +960,9 @@
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
-      "--json",
-      "{\"base_task_name\": \"Check/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\", \"tasks\": {\"Check/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
+      "--shards",
+      "1",
+      "Check/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571"
     ],
     "name": "Check",
     "~followup_annotations": [
@@ -998,8 +1000,9 @@
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
-      "--json",
-      "{\"base_task_name\": \"OptimizeForSize/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\", \"tasks\": {\"OptimizeForSize/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
+      "--shards",
+      "1",
+      "OptimizeForSize/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571"
     ],
     "name": "OptimizeForSize",
     "~followup_annotations": [
@@ -1037,8 +1040,9 @@
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
-      "--json",
-      "{\"base_task_name\": \"Test262/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\", \"tasks\": {\"Test262/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571:2:0\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}, \"Test262/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571:2:1\": {\"shard_index\": 1, \"task_id\": \"10100\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10100\"}}}"
+      "--shards",
+      "2",
+      "Test262/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571"
     ],
     "name": "Test262",
     "~followup_annotations": [
@@ -1076,8 +1080,9 @@
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
-      "--json",
-      "{\"base_task_name\": \"Mozilla/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\", \"tasks\": {\"Mozilla/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
+      "--shards",
+      "1",
+      "Mozilla/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571"
     ],
     "name": "Mozilla",
     "~followup_annotations": [
@@ -1115,8 +1120,9 @@
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
-      "--json",
-      "{\"base_task_name\": \"SimdJs - all/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\", \"tasks\": {\"SimdJs - all/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
+      "--shards",
+      "1",
+      "SimdJs - all/Ubuntu-12.04/[dummy has/V8 Linux - swarming staging/571"
     ],
     "name": "SimdJs - all",
     "~followup_annotations": [