Download the Android SDK as a CIPD package

scripts/slave/recipes/skia/swarm_trigger.expected/legacy_android_sdk.json

Index: scripts/slave/recipes/skia/swarm_trigger.expected/legacy_android_sdk.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Missing_android_sdk_hash.json b/scripts/slave/recipes/skia/swarm_trigger.expected/legacy_android_sdk.json
similarity index 98%
copy from scripts/slave/recipes/skia/swarm_trigger.expected/Missing_android_sdk_hash.json
copy to scripts/slave/recipes/skia/swarm_trigger.expected/legacy_android_sdk.json
index 0f370ea4117b21996228c28c477cef3a01759caa..467496ac21f40fd960cbe4c35ff7128376bf932a 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Missing_android_sdk_hash.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/legacy_android_sdk.json
@@ -213,7 +213,7 @@
     "name": "swarming.py --version",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
-      "@@@STEP_TEXT@0.4.10@@@"
+      "@@@STEP_TEXT@0.8.6@@@"
     ]
   },
   {
@@ -403,11 +403,7 @@
       "[SLAVE_BUILD]/skia/infra/bots/android_sdk_hash",
       "/path/to/tmp/"
     ],
-    "name": "Read android_sdk_hash",
-    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_EXCEPTION@@@"
-    ]
+    "name": "Read android_sdk_hash"
   },
   {
     "cmd": [
@@ -591,9 +587,8 @@
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
-      "--shards",
-      "1",
-      "compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan/5",
+      "--json",
+      "{\"base_task_name\": \"compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan/5\", \"tasks\": {\"compile_skia/Ubuntu/def456/Build-Ubuntu-GCC-Arm7-Release-Android_Vulkan/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
       "--task-summary-json",
       "/path/to/tmp/json"
     ],