[testing_requests] Remove logic for isolating images.

Led test for the failed builder topaz-x64-perf-dawson_canyon: https://chromium-swarm.appspot.com/task?id=4962962e3e3bc610

Bug: 36481
Change-Id: I5fcde00c83249430d74d564241fb6f35bfa57009
diff --git a/recipe_modules/build/examples/full.py b/recipe_modules/build/examples/full.py
index 3c748df..8756f45 100644
--- a/recipe_modules/build/examples/full.py
+++ b/recipe_modules/build/examples/full.py
@@ -231,7 +231,6 @@
         0,
         True,
         timeout_secs=0,
-        pave_from_gcs=True,
     )
     test_orchestration_inputs = api.build.TestOrchestrationInputs.from_build_results(
         build, shard_requests)
diff --git a/recipe_modules/testing/examples/full.py b/recipe_modules/testing/examples/full.py
index 68d0fd8..343eaca 100644
--- a/recipe_modules/testing/examples/full.py
+++ b/recipe_modules/testing/examples/full.py
@@ -84,15 +84,13 @@
         Property(kind=bool, help='Whether to use runtests', default=False),
     'variants':
         Property(kind=list, help='GN variants', default=[]),
-    'pave_from_gcs':
-        Property(kind=bool, help='Whether to pave from GCS', default=True),
 }
 
 
 def RunSteps(api, gcs_bucket, build_artifact_hash, device_type, pave,
              test_in_shards, upload_to_catapult, collect_timeout_secs,
              debug_symbol_gcs_bucket, test_async, per_test_timeout_secs,
-             use_runtests, variants, pave_from_gcs):
+             use_runtests, variants):
   upload_results = bool(gcs_bucket)
   # Intended to be a minimal amount of code to create a valid FuchsiaBuildResults object.
   checkout_root = api.path['start_dir']
@@ -119,7 +117,6 @@
       collect_timeout_secs=collect_timeout_secs,
       per_test_timeout_secs=per_test_timeout_secs,
       use_runtests=use_runtests,
-      pave_from_gcs=pave_from_gcs,
       default_service_account='default_service_account',
   )
   spec = Fuchsia(
@@ -141,7 +138,6 @@
         spec.test.use_runtests,
         timeout_secs=spec.test.timeout_secs,
         default_service_account=test_spec.default_service_account,
-        pave_from_gcs=test_spec.pave_from_gcs,
     )
     orchestration_inputs = api.build.TestOrchestrationInputs.from_build_results(
         build_results, shard_requests)
@@ -163,7 +159,6 @@
         .swarming_expiration_timeout_secs,
         swarming_io_timeout_secs=spec.test.swarming_io_timeout_secs,
         default_service_account=test_spec.default_service_account,
-        pave_from_gcs=test_spec.pave_from_gcs,
     )
     orchestration_inputs = api.build.TestOrchestrationInputs.from_build_results(
         build_results, shard_requests)
diff --git a/recipe_modules/testing_requests/api.py b/recipe_modules/testing_requests/api.py
index dff8cae..2b15e76 100644
--- a/recipe_modules/testing_requests/api.py
+++ b/recipe_modules/testing_requests/api.py
@@ -30,17 +30,9 @@
 class _TaskRequester(object):
   """Creates requests for swarming tasks that run tests."""
 
-  def __init__(self,
-               api,
-               buildbucket_build,
-               per_test_timeout_secs,
-               pool,
-               swarming_expiration_timeout_secs,
-               swarming_io_timeout_secs,
-               timeout_secs,
-               use_runtests,
-               default_service_account,
-               pave_from_gcs=False):
+  def __init__(self, api, buildbucket_build, per_test_timeout_secs, pool,
+               swarming_expiration_timeout_secs, swarming_io_timeout_secs,
+               timeout_secs, use_runtests, default_service_account):
     self._api = api
     self._buildbucket_build = buildbucket_build
     self._per_test_timeout_secs = per_test_timeout_secs
@@ -50,7 +42,6 @@
     self._timeout_secs = timeout_secs
     self._use_runtests = use_runtests
     self._default_service_account = default_service_account
-    self._pave_from_gcs = pave_from_gcs
 
   def request(self, shard, build_results):
     # Copy since we modify it for each shard.
@@ -114,9 +105,7 @@
     else:
       dimensions.update(shard.dimensions)
 
-    image_manifest = IMAGES_JSON
-    if self._pave_from_gcs:
-      image_manifest = '%s/%s' % (self._api.artifacts.image_url(), IMAGES_JSON)
+    image_manifest = '%s/%s' % (self._api.artifacts.image_url(), IMAGES_JSON)
 
     if shard.targets_fuchsia:
       botanist_cmd = [
@@ -189,7 +178,7 @@
         build_results,
         shard=shard,
         test_bot_cpu=test_bot_cpu,
-        pave_from_gcs=self._pave_from_gcs)
+    )
 
     env_name = '%s-%s' % (shard.device_type or shard.os, build_results.target)
     tags = {'test_environment_name': [env_name]}
@@ -274,7 +263,6 @@
       swarming_io_timeout_secs,
       use_runtests,
       default_service_account=None,
-      pave_from_gcs=False,
       # TODO(garymm): Remove default value.
       # We should always get this from a spec.
       timeout_secs=40 * 60):
@@ -292,7 +280,6 @@
         when executing tests on target.
       default_service_account (str|None): The default service account to run the
         test task with. This is required for fetching images from GCS.
-      pave_from_gcs (bool): Whether to pave with images from GCS or not.
       timeout_secs (int): The amount of seconds to wait for the tests to execute
         before giving up.
     """
@@ -324,7 +311,6 @@
         timeout_secs=timeout_secs,
         use_runtests=use_runtests,
         default_service_account=default_service_account,
-        pave_from_gcs=pave_from_gcs,
     )
     shard_requests = []
     for s in shards:
@@ -341,8 +327,7 @@
                                 pave,
                                 swarming_expiration_timeout_secs=18000,
                                 swarming_io_timeout_secs=5 * 60,
-                                default_service_account=None,
-                                pave_from_gcs=False):
+                                default_service_account=None):
     """Returns a swarming task request for testing in the deprecated way.
 
     Args:
@@ -359,7 +344,6 @@
         not produce any output for this long.
       default_service_account (str|None): The default service account to run the
         task with.
-      pave_from_gcs (bool): Whether to pave with images from GCS or not.
 
     Returns:
       A list of a single ShardTaskRequest.
@@ -377,7 +361,6 @@
         device_type=device_type,
         pave=pave,
         test_cmds=test_cmds,
-        in_place=pave_from_gcs,
     )
 
     if self.m.emu.is_emulator_type(device_type):
@@ -390,7 +373,6 @@
           swarming_io_timeout_secs=swarming_io_timeout_secs,
           qemu_type=device_type,
           service_account=default_service_account,
-          pave_from_gcs=pave_from_gcs,
       )
     else:
       task = self._construct_device_task_request(
@@ -403,7 +385,6 @@
           swarming_expiration_timeout_secs=swarming_expiration_timeout_secs,
           swarming_io_timeout_secs=swarming_io_timeout_secs,
           service_account=default_service_account,
-          pave_from_gcs=pave_from_gcs,
       )
     # In the deprecated testing code paths, shards are not used, but it makes
     # other code simpler to have a valid shard here.
@@ -431,7 +412,6 @@
                                           swarming_io_timeout_secs,
                                           qemu_type,
                                           service_account,
-                                          pave_from_gcs=False,
                                           shard=None):
     """Constructs a Swarming task request which runs Fuchsia tests inside QEMU.
 
@@ -445,7 +425,6 @@
         before giving up.
       qemu_type (str): type of qemu, either QEMU or AEMU.
       service_account (str|None): The service account to run the task with.
-      pave_from_gcs (bool): Whether to pave with images from GCS or not.
       shard (api.testsharder.Shard|None): The shard associated with the task or
         None if it's not a shard.
 
@@ -477,9 +456,7 @@
       ensure_file.add_package('infra/tools/luci-auth/${platform}', 'latest')
       cmd.extend(['./luci-auth', 'context', '--'])
 
-    image_manifest = IMAGES_JSON
-    if pave_from_gcs:
-      image_manifest = '%s/%s' % (self.m.artifacts.image_url(), IMAGES_JSON)
+    image_manifest = '%s/%s' % (self.m.artifacts.image_url(), IMAGES_JSON)
 
     cmd.extend([
       './botanist',
@@ -516,7 +493,6 @@
         # To take advantage of KVM, we execute QEMU-arm tasks on arm hardware.
         test_bot_cpu=build_results.target,
         legacy_qemu=True,
-        pave_from_gcs=pave_from_gcs,
     )
 
     if qemu_type == 'AEMU':
@@ -544,17 +520,10 @@
       with_cipd_ensure_file(ensure_file)
     )) #yapf: disable
 
-  def _construct_device_task_request(self,
-                                     task_name,
-                                     device_type,
-                                     build_results,
-                                     pool,
-                                     pave,
-                                     timeout_secs,
+  def _construct_device_task_request(self, task_name, device_type,
+                                     build_results, pool, pave, timeout_secs,
                                      swarming_expiration_timeout_secs,
-                                     swarming_io_timeout_secs,
-                                     service_account,
-                                     pave_from_gcs=False):
+                                     swarming_io_timeout_secs, service_account):
     """Constructs a Swarming task request to run Fuchsia tests on a device.
 
     Expects the build and artifacts to be at the same place they were at
@@ -567,7 +536,6 @@
       timeout_secs (int): The amount of seconds to wait for the tests to execute
         before giving up.
       service_account (str|None): The service account to run the task with.
-      pave_from_gcs (bool): Whether to pave with images from GCS or not.
 
     Returns:
       An api.swarming.TaskRequest representing the swarming task request.
@@ -580,9 +548,7 @@
       ensure_file.add_package('infra/tools/luci-auth/${platform}', 'latest')
       cmd.extend(['./luci-auth', 'context', '--'])
 
-    image_manifest = IMAGES_JSON
-    if pave_from_gcs:
-      image_manifest = '%s/%s' % (self.m.artifacts.image_url(), IMAGES_JSON)
+    image_manifest = '%s/%s' % (self.m.artifacts.image_url(), IMAGES_JSON)
 
     # Construct the botanist command.
     cmd.extend([
@@ -613,8 +579,7 @@
     # directory without fear of collision, and (c) not having to isolate
     # extraneous files.
     isolate_tree = self.m.file.symlink_tree(root=self.m.path.mkdtemp('isolate'))
-    isolated_hash = self._isolate_build_artifacts(
-        isolate_tree, build_results, pave_from_gcs=pave_from_gcs)
+    isolated_hash = self._isolate_build_artifacts(isolate_tree, build_results)
 
     dimensions = {
         'pool': pool,
@@ -681,7 +646,6 @@
       shard=None,
       test_bot_cpu='x64',
       legacy_qemu=False,
-      pave_from_gcs=False,
   ):
     """Populates a tree with build artifacts and isolates it.
 
@@ -698,7 +662,6 @@
       test_bot_cpu (str|None): The host cpu of the bot running the test task.
       legacy_qemu (bool): Whether to only isolate the images needed to run QEMU
         alone.
-      pave_from_gcs (bool): Whether to pave with images from GCS or not.
 
     Returns:
       The isolated hash that may be used to reference and download the
@@ -712,32 +675,6 @@
           linkname=isolate_tree.root.join(relpath),
       )
 
-    # TODO(IN-931): Remove `shard is None` condition once device and QEMU
-    # codepaths are passing shard and using _construct_test_task_request().
-    no_shard = shard is None
-
-    # If paving from GCS, then we don't need to ship images over to the tester
-    # via isolated.
-    if not pave_from_gcs and (no_shard or shard.targets_fuchsia):
-      image_list = build_results.images.values()
-      # In the case of an emulated target, we restrict what we isolate to the
-      # bare essentials to avoid the needless downloading of several gigabytes
-      # of images on the other end.
-      is_emulated_target = (
-            (no_shard and legacy_qemu) or
-            (shard and self.m.emu.is_emulator_type(shard.device_type))
-      ) # yapf: disable
-      if is_emulated_target:
-        image_list = [
-          img for img in image_list
-          if img['name'] in ['qemu-kernel', 'zircon-a', 'storage-full']
-        ] # yapf: disable
-      image_manifest_path = isolate_tree.root.join(IMAGES_JSON)
-      self.m.file.write_json(
-          'write image manifest', image_manifest_path, image_list, indent=2)
-      for image in image_list:
-        register_link(image['path'])
-
     if shard:
       for test in shard.tests:
         if test.os in ['linux', 'mac']:
@@ -781,8 +718,7 @@
                              per_test_timeout_secs=None,
                              device_type=None,
                              pave=False,
-                             test_cmds=None,
-                             in_place=False):
+                             test_cmds=None):
     """Creates the files used to invoke runtests on boot.
 
     This is only necessary for QEMU shards, which are the only shards that
@@ -801,18 +737,13 @@
     runcmds_path = self.m.path['cleanup'].join('runcmds')
     self._create_runcmds_script(device_type, test_cmds, runcmds_path)
 
-    input_zbi = build_results.fuchsia_build_dir.join(
+    zbi_path = build_results.fuchsia_build_dir.join(
         build_results.images[zbi_name]['path'])
-    if in_place:
-      output_zbi = input_zbi
-    else:
-      build_results.images[zbi_name]['path'] = 'test-infra.zbi'
-      output_zbi = build_results.fuchsia_build_dir.join('test-infra.zbi')
 
     # Inject the runcmds script and/or authorized key into the bootfs image.
     self.m.zbi.copy_and_extend(
         step_name='create zbi',
-        input_image=input_zbi,
-        output_image=output_zbi,
+        input_image=zbi_path,
+        output_image=zbi_path,
         manifest={RUNCMDS_BOOTFS_PATH: runcmds_path},
     )
diff --git a/recipe_modules/testing_requests/examples/full.expected/deprecated_non_emu_netboot.json b/recipe_modules/testing_requests/examples/full.expected/deprecated_non_emu_netboot.json
index f393f3a..ad2ac32 100644
--- a/recipe_modules/testing_requests/examples/full.expected/deprecated_non_emu_netboot.json
+++ b/recipe_modules/testing_requests/examples/full.expected/deprecated_non_emu_netboot.json
@@ -1146,7 +1146,7 @@
     "cmd": [
       "[START_DIR]/out/default.zircon/host-linux-x64/zbi",
       "--output",
-      "[START_DIR]/out/default/test-infra.zbi",
+      "[START_DIR]/out/default/netboot.zbi",
       "[START_DIR]/out/default/netboot.zbi",
       "--entry",
       "infra/runcmds=[CLEANUP]/runcmds"
@@ -1155,91 +1155,11 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[\n  {\n    \"path\": \"multiboot.bin\", \n    \"type\": \"kernel\", \n    \"name\": \"qemu-kernel\"\n  }, \n  {\n    \"path\": \"test-infra.zbi\", \n    \"bootserver_netboot\": [\n      \"--boot\"\n    ], \n    \"type\": \"zbi\", \n    \"name\": \"netboot\"\n  }, \n  {\n    \"path\": \"fuchsia.zbi\", \n    \"type\": \"zbi\", \n    \"name\": \"zircon-a\", \n    \"bootserver_pave\": [\n      \"--boot\", \n      \"--zircona\"\n    ]\n  }, \n  {\n    \"path\": \"build-archive.zip\", \n    \"type\": \"zip\", \n    \"name\": \"archive\"\n  }, \n  {\n    \"path\": \"fuchsia.esp.blk\", \n    \"type\": \"blk\", \n    \"name\": \"efi\", \n    \"bootserver_pave\": [\n      \"--efi\"\n    ]\n  }, \n  {\n    \"path\": \"zircon-r.zbi\", \n    \"type\": \"zbi\", \n    \"name\": \"zircon-r\", \n    \"bootserver_pave\": [\n      \"--zircon-r\"\n    ]\n  }, \n  {\n    \"path\": \"fvm.blk\", \n    \"type\": \"blk\", \n    \"name\": \"storage-full\"\n  }, \n  {\n    \"path\": \"fvm.sparse.blk\", \n    \"type\": \"blk\", \n    \"name\": \"storage-sparse\", \n    \"bootserver_pave\": [\n      \"--fvm\"\n    ]\n  }, \n  {\n    \"path\": \"symbol-archive.tgz\", \n    \"type\": \"tgz\", \n    \"name\": \"symbol-archive\"\n  }\n]",
-      "[CLEANUP]/isolate_tmp_1/images.json"
-    ],
-    "infra_step": true,
-    "name": "write image manifest",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@images.json@[@@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"multiboot.bin\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"kernel\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"qemu-kernel\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"test-infra.zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"bootserver_netboot\": [@@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--boot\"@@@",
-      "@@@STEP_LOG_LINE@images.json@    ], @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"netboot\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"fuchsia.zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"zircon-a\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--boot\", @@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--zircona\"@@@",
-      "@@@STEP_LOG_LINE@images.json@    ]@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"build-archive.zip\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"zip\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"archive\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"fuchsia.esp.blk\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"blk\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"efi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--efi\"@@@",
-      "@@@STEP_LOG_LINE@images.json@    ]@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"zircon-r.zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"zircon-r\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--zircon-r\"@@@",
-      "@@@STEP_LOG_LINE@images.json@    ]@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"fvm.blk\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"blk\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"storage-full\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"fvm.sparse.blk\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"blk\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"storage-sparse\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--fvm\"@@@",
-      "@@@STEP_LOG_LINE@images.json@    ]@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"symbol-archive.tgz\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"tgz\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"symbol-archive\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }@@@",
-      "@@@STEP_LOG_LINE@images.json@]@@@",
-      "@@@STEP_LOG_END@images.json@@@"
-    ]
-  },
-  {
-    "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
       "--link-json",
-      "{\"[START_DIR]/out/default/build-archive.zip\": [\"[CLEANUP]/isolate_tmp_1/build-archive.zip\"], \"[START_DIR]/out/default/fuchsia.esp.blk\": [\"[CLEANUP]/isolate_tmp_1/fuchsia.esp.blk\"], \"[START_DIR]/out/default/fuchsia.zbi\": [\"[CLEANUP]/isolate_tmp_1/fuchsia.zbi\"], \"[START_DIR]/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_1/fvm.blk\"], \"[START_DIR]/out/default/fvm.sparse.blk\": [\"[CLEANUP]/isolate_tmp_1/fvm.sparse.blk\"], \"[START_DIR]/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_1/bootserver_new\"], \"[START_DIR]/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_1/botanist\"], \"[START_DIR]/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_1/testrunner\"], \"[START_DIR]/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_1/multiboot.bin\"], \"[START_DIR]/out/default/symbol-archive.tgz\": [\"[CLEANUP]/isolate_tmp_1/symbol-archive.tgz\"], \"[START_DIR]/out/default/test-infra.zbi\": [\"[CLEANUP]/isolate_tmp_1/test-infra.zbi\"], \"[START_DIR]/out/default/zircon-r.zbi\": [\"[CLEANUP]/isolate_tmp_1/zircon-r.zbi\"], \"[START_DIR]/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_1/llvm-symbolizer\"]}"
+      "{\"[START_DIR]/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_1/bootserver_new\"], \"[START_DIR]/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_1/botanist\"], \"[START_DIR]/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_1/testrunner\"], \"[START_DIR]/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_1/llvm-symbolizer\"]}"
     ],
     "infra_step": true,
     "name": "create tree of build artifacts"
diff --git a/recipe_modules/testing_requests/examples/full.expected/qemu.json b/recipe_modules/testing_requests/examples/full.expected/qemu.json
index bc30ceb..d640bdf 100644
--- a/recipe_modules/testing_requests/examples/full.expected/qemu.json
+++ b/recipe_modules/testing_requests/examples/full.expected/qemu.json
@@ -1195,50 +1195,11 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[\n  {\n    \"path\": \"multiboot.bin\", \n    \"type\": \"kernel\", \n    \"name\": \"qemu-kernel\"\n  }, \n  {\n    \"path\": \"fuchsia.zbi\", \n    \"type\": \"zbi\", \n    \"name\": \"zircon-a\", \n    \"bootserver_pave\": [\n      \"--boot\", \n      \"--zircona\"\n    ]\n  }, \n  {\n    \"path\": \"fvm.blk\", \n    \"type\": \"blk\", \n    \"name\": \"storage-full\"\n  }\n]",
-      "[CLEANUP]/isolate_tmp_1/images.json"
-    ],
-    "infra_step": true,
-    "name": "shard NAME.write image manifest",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@images.json@[@@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"multiboot.bin\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"kernel\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"qemu-kernel\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"fuchsia.zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"zircon-a\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--boot\", @@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--zircona\"@@@",
-      "@@@STEP_LOG_LINE@images.json@    ]@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"fvm.blk\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"blk\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"storage-full\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }@@@",
-      "@@@STEP_LOG_LINE@images.json@]@@@",
-      "@@@STEP_LOG_END@images.json@@@"
-    ]
-  },
-  {
-    "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
       "--link-json",
-      "{\"/path/to/dep\": [\"/path/to/dep\"], \"/path/to/test\": [\"/path/to/test\"], \"[START_DIR]/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_1/private_key\"], \"[START_DIR]/out/default/fuchsia.zbi\": [\"[CLEANUP]/isolate_tmp_1/fuchsia.zbi\"], \"[START_DIR]/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_1/fvm.blk\"], \"[START_DIR]/out/default/linux_arm64/botanist\": [\"[CLEANUP]/isolate_tmp_1/botanist\"], \"[START_DIR]/out/default/linux_arm64/testrunner\": [\"[CLEANUP]/isolate_tmp_1/testrunner\"], \"[START_DIR]/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_1/bootserver_new\"], \"[START_DIR]/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_1/multiboot.bin\"], \"[START_DIR]/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_1/llvm-symbolizer\"]}"
+      "{\"/path/to/dep\": [\"/path/to/dep\"], \"/path/to/test\": [\"/path/to/test\"], \"[START_DIR]/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_1/private_key\"], \"[START_DIR]/out/default/linux_arm64/botanist\": [\"[CLEANUP]/isolate_tmp_1/botanist\"], \"[START_DIR]/out/default/linux_arm64/testrunner\": [\"[CLEANUP]/isolate_tmp_1/testrunner\"], \"[START_DIR]/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_1/bootserver_new\"], \"[START_DIR]/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_1/llvm-symbolizer\"]}"
     ],
     "infra_step": true,
     "name": "shard NAME.create tree of build artifacts",
diff --git a/recipe_modules/testing_requests/examples/full.expected/qemu_pave_from_gcs.json b/recipe_modules/testing_requests/examples/full.expected/qemu_pave_from_gcs.json
deleted file mode 100644
index d640bdf..0000000
--- a/recipe_modules/testing_requests/examples/full.expected/qemu_pave_from_gcs.json
+++ /dev/null
@@ -1,1269 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[START_DIR]/out/default/zircon.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "read zircon ninja instructions",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"dir\": \"../default.zircon\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"targets\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"legacy-host_tests\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"manifest-$cpu\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[START_DIR]/out/default/images.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "read images",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"--boot\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"--zircona\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"zircon-a\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"fuchsia.zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"zbi\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"storage-full\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"fvm.blk\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"blk\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"--fvm\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"storage-sparse\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"fvm.sparse.blk\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"blk\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"--efi\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"efi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"fuchsia.esp.blk\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"blk\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"bootserver_netboot\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"--boot\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"netboot\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"netboot.zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"zbi\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"archive\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"build-archive.tgz\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"tgz\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"archive\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"build-archive.zip\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"zip\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"qemu-kernel\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"multiboot.bin\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"kernel\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"symbol-archive\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"symbol-archive.tgz\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"tgz\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"--zircon-r\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"zircon-r\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"zircon-r.zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"zbi\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[START_DIR]/out/default/tool_paths.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "read tool_paths manifest",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-symbolizer\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-symbolizer\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-profdata\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-profdata\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-profdata/linux_x64/llvm-profdata\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-cov\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-cov\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-cov/linux_x64/llvm-cov\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/ninja\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"ninja\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/ninja/linux_x64/ninja\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-doc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-doc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-doc/linux_x64/clang-doc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-format/linux_x64/clang-format\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-format-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-format-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-format-diff/linux_x64/clang-format-diff\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-tidy\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-tidy\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-tidy/linux_x64/clang-tidy\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-tidy-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-tidy-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-tidy-diff/linux_x64/clang-tidy-diff\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/dart\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"dart\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/dart/linux_x64/dart\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/dartfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"dartfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/dartfmt/linux_x64/dartfmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/gn\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"gn\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/gn/linux_x64/gn\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/go\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"go\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/go/linux_x64/go\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/gofmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"gofmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/gofmt/linux_x64/gofmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/cargo\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"cargo\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/cargo/linux_x64/cargo\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustc/linux_x64/rustc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustdoc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustdoc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustdoc/linux_x64/rustdoc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustfmt/linux_x64/rustfmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/yapf\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"yapf\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/yapf/linux_x64/yapf\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bazel\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bazel\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/bazel/linux_x64/bazel\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fidl-lint\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fidl-lint\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-x64/fidl-lint\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/minfs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"minfs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-x64/minfs\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bootserver\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bootserver\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-x64/bootserver\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fvm\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fvm\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-x64/fvm\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-x64/zbi\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fidl-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fidl-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-x64/fidl-format\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/symbolize\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"symbolize\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_x64/symbolize\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/ninjatrace\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"ninjatrace\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_x64/ninjatrace\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/covargs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"covargs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_x64/covargs\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/testsharder\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"testsharder\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_x64/testsharder\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/botanist\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"botanist\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_x64/botanist\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/testrunner\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"testrunner\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_x64/testrunner\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/size_checker\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"size_checker\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_x64/size_checker\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/upload_debug_symbols\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"upload_debug_symbols\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_x64/upload_debug_symbols\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/artifactory\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"artifactory\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_x64/artifactory\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bootserver_new\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bootserver_new\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_x64/bootserver_new\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-symbolizer\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-symbolizer\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-symbolizer/linux_arm64/llvm-symbolizer\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-profdata\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-profdata\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-profdata/linux_arm64/llvm-profdata\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-cov\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-cov\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-cov/linux_arm64/llvm-cov\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/ninja\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"ninja\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/ninja/linux_arm64/ninja\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-doc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-doc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-doc/linux_arm64/clang-doc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-format/linux_arm64/clang-format\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-format-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-format-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-format-diff/linux_arm64/clang-format-diff\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-tidy\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-tidy\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-tidy/linux_arm64/clang-tidy\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-tidy-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-tidy-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-tidy-diff/linux_arm64/clang-tidy-diff\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/dart\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"dart\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/dart/linux_arm64/dart\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/dartfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"dartfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/dartfmt/linux_arm64/dartfmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/gn\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"gn\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/gn/linux_arm64/gn\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/go\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"go\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/go/linux_arm64/go\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/gofmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"gofmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/gofmt/linux_arm64/gofmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/cargo\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"cargo\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/cargo/linux_arm64/cargo\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustc/linux_arm64/rustc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustdoc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustdoc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustdoc/linux_arm64/rustdoc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustfmt/linux_arm64/rustfmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/yapf\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"yapf\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/yapf/linux_arm64/yapf\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bazel\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bazel\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/bazel/linux_arm64/bazel\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fidl-lint\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fidl-lint\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-arm64/fidl-lint\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/minfs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"minfs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-arm64/minfs\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bootserver\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bootserver\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-arm64/bootserver\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fvm\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fvm\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-arm64/fvm\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-arm64/zbi\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fidl-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fidl-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-linux-arm64/fidl-format\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/symbolize\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"symbolize\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_arm64/symbolize\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/ninjatrace\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"ninjatrace\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_arm64/ninjatrace\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/covargs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"covargs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_arm64/covargs\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/testsharder\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"testsharder\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_arm64/testsharder\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/botanist\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"botanist\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_arm64/botanist\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/testrunner\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"testrunner\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_arm64/testrunner\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/size_checker\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"size_checker\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_arm64/size_checker\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/upload_debug_symbols\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"upload_debug_symbols\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_arm64/upload_debug_symbols\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/artifactory\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"artifactory\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_arm64/artifactory\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bootserver_new\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bootserver_new\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"linux_arm64/bootserver_new\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-symbolizer\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-symbolizer\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-symbolizer/mac_x64/llvm-symbolizer\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-profdata\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-profdata\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-profdata/mac_x64/llvm-profdata\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-cov\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-cov\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-cov/mac_x64/llvm-cov\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/ninja\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"ninja\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/ninja/mac_x64/ninja\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-doc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-doc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-doc/mac_x64/clang-doc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-format/mac_x64/clang-format\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-format-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-format-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-format-diff/mac_x64/clang-format-diff\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-tidy\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-tidy\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-tidy/mac_x64/clang-tidy\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-tidy-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-tidy-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-tidy-diff/mac_x64/clang-tidy-diff\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/dart\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"dart\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/dart/mac_x64/dart\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/dartfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"dartfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/dartfmt/mac_x64/dartfmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/gn\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"gn\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/gn/mac_x64/gn\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/go\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"go\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/go/mac_x64/go\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/gofmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"gofmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/gofmt/mac_x64/gofmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/cargo\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"cargo\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/cargo/mac_x64/cargo\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustc/mac_x64/rustc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustdoc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustdoc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustdoc/mac_x64/rustdoc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustfmt/mac_x64/rustfmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/yapf\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"yapf\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/yapf/mac_x64/yapf\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bazel\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bazel\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/bazel/mac_x64/bazel\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fidl-lint\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fidl-lint\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-x64/fidl-lint\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/minfs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"minfs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-x64/minfs\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bootserver\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bootserver\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-x64/bootserver\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fvm\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fvm\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-x64/fvm\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-x64/zbi\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fidl-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fidl-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-x64/fidl-format\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/symbolize\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"symbolize\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_x64/symbolize\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/ninjatrace\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"ninjatrace\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_x64/ninjatrace\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/covargs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"covargs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_x64/covargs\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/testsharder\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"testsharder\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_x64/testsharder\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/botanist\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"botanist\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_x64/botanist\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/testrunner\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"testrunner\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_x64/testrunner\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/size_checker\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"size_checker\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_x64/size_checker\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/upload_debug_symbols\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"upload_debug_symbols\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_x64/upload_debug_symbols\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/artifactory\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"artifactory\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_x64/artifactory\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bootserver_new\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bootserver_new\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_x64/bootserver_new\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-symbolizer\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-symbolizer\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-symbolizer/mac_arm64/llvm-symbolizer\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-profdata\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-profdata\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-profdata/mac_arm64/llvm-profdata\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/llvm-cov\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"llvm-cov\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/llvm-cov/mac_arm64/llvm-cov\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/ninja\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"ninja\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/ninja/mac_arm64/ninja\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-doc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-doc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-doc/mac_arm64/clang-doc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-format/mac_arm64/clang-format\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-format-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-format-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-format-diff/mac_arm64/clang-format-diff\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-tidy\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-tidy\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-tidy/mac_arm64/clang-tidy\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/clang-tidy-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"clang-tidy-diff\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/clang-tidy-diff/mac_arm64/clang-tidy-diff\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/dart\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"dart\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/dart/mac_arm64/dart\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/dartfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"dartfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/dartfmt/mac_arm64/dartfmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/gn\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"gn\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/gn/mac_arm64/gn\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/go\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"go\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/go/mac_arm64/go\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/gofmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"gofmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/gofmt/mac_arm64/gofmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/cargo\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"cargo\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/cargo/mac_arm64/cargo\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustc/mac_arm64/rustc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustdoc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustdoc\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustdoc/mac_arm64/rustdoc\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/rustfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"rustfmt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/rustfmt/mac_arm64/rustfmt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/yapf\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"yapf\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/yapf/mac_arm64/yapf\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bazel\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bazel\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../../prebuilt/third_party/bazel/mac_arm64/bazel\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fidl-lint\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fidl-lint\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-arm64/fidl-lint\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/minfs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"minfs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-arm64/minfs\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bootserver\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bootserver\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-arm64/bootserver\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fvm\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fvm\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-arm64/fvm\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-arm64/zbi\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/fidl-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fidl-format\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"../default.zircon/host-mac-arm64/fidl-format\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/symbolize\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"symbolize\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_arm64/symbolize\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/ninjatrace\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"ninjatrace\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_arm64/ninjatrace\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/covargs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"covargs\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_arm64/covargs\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/testsharder\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"testsharder\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_arm64/testsharder\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/botanist\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"botanist\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_arm64/botanist\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/testrunner\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"testrunner\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_arm64/testrunner\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/size_checker\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"size_checker\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_arm64/size_checker\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/upload_debug_symbols\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"upload_debug_symbols\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_arm64/upload_debug_symbols\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/artifactory\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"artifactory\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_arm64/artifactory\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"cpu\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"label\": \"//tools/bootserver_new\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"bootserver_new\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"os\": \"mac\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"mac_arm64/bootserver_new\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/out/default.zircon/host-linux-x64/zbi",
-      "--output",
-      "[START_DIR]/out/default/fuchsia.zbi",
-      "[START_DIR]/out/default/fuchsia.zbi",
-      "--entry",
-      "data/ssh/authorized_keys=[START_DIR]/.ssh/authorized_keys"
-    ],
-    "name": "embed authorized key"
-  },
-  {
-    "cmd": [],
-    "name": "shard NAME"
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[\n  {\n    \"path\": \"/path/to/test\", \n    \"os\": \"linux\", \n    \"name\": \"TEST\", \n    \"install_path\": \"/path/to/test\", \n    \"label\": \"//path/to/test:test(//toolchain)\"\n  }\n]",
-      "[CLEANUP]/isolate_tmp_1/tests.json"
-    ],
-    "infra_step": true,
-    "name": "shard NAME.write test manifest",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@tests.json@[@@@",
-      "@@@STEP_LOG_LINE@tests.json@  {@@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"path\": \"/path/to/test\", @@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"name\": \"TEST\", @@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"install_path\": \"/path/to/test\", @@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"label\": \"//path/to/test:test(//toolchain)\"@@@",
-      "@@@STEP_LOG_LINE@tests.json@  }@@@",
-      "@@@STEP_LOG_LINE@tests.json@]@@@",
-      "@@@STEP_LOG_END@tests.json@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[\n  {\n    \"target\": \"arm64\", \n    \"kvm\": true, \n    \"memory\": 8192, \n    \"path\": \"./qemu/bin\", \n    \"type\": \"qemu\", \n    \"cpu\": 8\n  }\n]",
-      "[CLEANUP]/isolate_tmp_1/qemu.json"
-    ],
-    "infra_step": true,
-    "name": "shard NAME.write qemu config",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@qemu.json@[@@@",
-      "@@@STEP_LOG_LINE@qemu.json@  {@@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"target\": \"arm64\", @@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"kvm\": true, @@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"memory\": 8192, @@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"path\": \"./qemu/bin\", @@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"type\": \"qemu\", @@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"cpu\": 8@@@",
-      "@@@STEP_LOG_LINE@qemu.json@  }@@@",
-      "@@@STEP_LOG_LINE@qemu.json@]@@@",
-      "@@@STEP_LOG_END@qemu.json@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
-      "--link-json",
-      "{\"/path/to/dep\": [\"/path/to/dep\"], \"/path/to/test\": [\"/path/to/test\"], \"[START_DIR]/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_1/private_key\"], \"[START_DIR]/out/default/linux_arm64/botanist\": [\"[CLEANUP]/isolate_tmp_1/botanist\"], \"[START_DIR]/out/default/linux_arm64/testrunner\": [\"[CLEANUP]/isolate_tmp_1/testrunner\"], \"[START_DIR]/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_1/bootserver_new\"], \"[START_DIR]/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_1/llvm-symbolizer\"]}"
-    ],
-    "infra_step": true,
-    "name": "shard NAME.create tree of build artifacts",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "shard NAME.ensure isolated",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/isolated_client",
-      "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:305e79001db1846906c7136d90a863bee5bd3bfc",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "shard NAME.ensure isolated.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:305\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[CACHE]/isolated_client/isolated",
-      "archive",
-      "-verbose",
-      "-isolate-server",
-      "https://example.isolateserver.appspot.com",
-      "-namespace",
-      "default-gzip",
-      "-dump-hash",
-      "/path/to/tmp/",
-      "-dirs",
-      "[CLEANUP]/isolate_tmp_1:."
-    ],
-    "infra_step": true,
-    "name": "shard NAME.isolate build artifacts",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@isolated UI@https://example.isolateserver.appspot.com/browse?namespace=default-gzip&hash=%5Bdummy+hash%5D@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipe_modules/testing_requests/examples/full.py b/recipe_modules/testing_requests/examples/full.py
index a0ce185..d671ca9 100644
--- a/recipe_modules/testing_requests/examples/full.py
+++ b/recipe_modules/testing_requests/examples/full.py
@@ -69,14 +69,12 @@
         Property(kind=bool, help='Whether to use runtests', default=False),
     'variants':
         Property(kind=list, help='GN variants', default=[]),
-    'pave_from_gcs':
-        Property(kind=bool, help='Whether to pave from GCS', default=True),
 }
 
 
 def RunSteps(api, build_artifact_hash, device_type, pave, test_in_shards,
              collect_timeout_secs, deprecated, per_test_timeout_secs,
-             use_runtests, variants, pave_from_gcs):
+             use_runtests, variants):
 
   # Intended to be a minimal amount of code to create a valid FuchsiaBuildResults object.
   checkout_root = api.path['start_dir']
@@ -102,7 +100,6 @@
       collect_timeout_secs=collect_timeout_secs,
       per_test_timeout_secs=per_test_timeout_secs,
       use_runtests=use_runtests,
-      pave_from_gcs=pave_from_gcs,
       default_service_account='default_service_account',
   )
 
@@ -115,7 +112,6 @@
         test_spec.timeout_secs,
         test_spec.pave,
         default_service_account=test_spec.default_service_account,
-        pave_from_gcs=test_spec.pave_from_gcs,
     )
     assert len(shard_requests) == 1
   else:
@@ -134,8 +130,7 @@
         build_results, api.buildbucket.build, test_spec.per_test_timeout_secs,
         test_spec.pool, shards, test_spec.swarming_expiration_timeout_secs,
         test_spec.swarming_io_timeout_secs, test_spec.use_runtests,
-        test_spec.default_service_account, test_spec.pave_from_gcs,
-        test_spec.timeout_secs)
+        test_spec.default_service_account, test_spec.timeout_secs)
 
 
 def GenTests(api):
@@ -154,7 +149,6 @@
       device_type='QEMU',
       per_test_timeout_secs=1,
       test_in_shards=False,
-      pave_from_gcs=True,
       variants=['host-asan', 'asan'],
   )
   yield test('deprecated_aemu') + api.properties(
@@ -162,7 +156,6 @@
       device_type='AEMU',
       per_test_timeout_secs=1,
       test_in_shards=False,
-      pave_from_gcs=True,
       variants=['host-asan', 'asan'],
   )
 
@@ -171,14 +164,12 @@
       pave=True,
       device_type='DEVICE TYPE',
       test_in_shards=False,
-      pave_from_gcs=True,
   )
   yield test('deprecated_non_emu_netboot') + api.properties(
       deprecated=True,
       pave=False,
       device_type='DEVICE TYPE',
       test_in_shards=False,
-      pave_from_gcs=False,
   )
 
   yield test('not-emu') + api.properties(
@@ -187,16 +178,8 @@
       use_runtests=True,
       per_test_timeout_secs=1,
       variants=['host-asan', 'asan'],
-      pave_from_gcs=True)
-
-  yield test('qemu') + api.properties(
-      per_test_timeout_secs=1,
-      pave_from_gcs=False,
   )
 
-  yield test('qemu_pave_from_gcs') + api.properties(
-      per_test_timeout_secs=1,
-      pave_from_gcs=True,
-  )
+  yield test('qemu') + api.properties(per_test_timeout_secs=1,)
 
   yield test('aemu') + api.properties(device_type='AEMU',)
diff --git a/recipes/fuchsia/build.expected/default.json b/recipes/fuchsia/build.expected/default.json
index 0f8471d..1f203b9 100644
--- a/recipes/fuchsia/build.expected/default.json
+++ b/recipes/fuchsia/build.expected/default.json
@@ -33,7 +33,6 @@
       "@@@STEP_LOG_LINE@textproto@  test_in_shards: true@@@",
       "@@@STEP_LOG_LINE@textproto@  timeout_secs: 1800@@@",
       "@@@STEP_LOG_LINE@textproto@  default_service_account: \"service_account\"@@@",
-      "@@@STEP_LOG_LINE@textproto@  pave_from_gcs: true@@@",
       "@@@STEP_LOG_LINE@textproto@}@@@",
       "@@@STEP_LOG_LINE@textproto@gcs_bucket: \"fuchsia-infra\"@@@",
       "@@@STEP_LOG_LINE@textproto@artifact_gcs_bucket: \"fuchsia-infra-artifacts\"@@@",
diff --git a/recipes/fuchsia/build.expected/default_cq.json b/recipes/fuchsia/build.expected/default_cq.json
index 0300d41..cb39e1e 100644
--- a/recipes/fuchsia/build.expected/default_cq.json
+++ b/recipes/fuchsia/build.expected/default_cq.json
@@ -133,7 +133,6 @@
       "@@@STEP_LOG_LINE@textproto@  test_in_shards: true@@@",
       "@@@STEP_LOG_LINE@textproto@  timeout_secs: 1800@@@",
       "@@@STEP_LOG_LINE@textproto@  default_service_account: \"service_account\"@@@",
-      "@@@STEP_LOG_LINE@textproto@  pave_from_gcs: true@@@",
       "@@@STEP_LOG_LINE@textproto@}@@@",
       "@@@STEP_LOG_LINE@textproto@artifact_gcs_bucket: \"fuchsia-infra-artifacts\"@@@",
       "@@@STEP_LOG_LINE@textproto@debug_symbol_gcs_bucket: \"debug-symbols\"@@@",
diff --git a/recipes/fuchsia/build.expected/non-numeric-parent-id.json b/recipes/fuchsia/build.expected/non-numeric-parent-id.json
index ddc3774..eee562b 100644
--- a/recipes/fuchsia/build.expected/non-numeric-parent-id.json
+++ b/recipes/fuchsia/build.expected/non-numeric-parent-id.json
@@ -33,7 +33,6 @@
       "@@@STEP_LOG_LINE@textproto@  test_in_shards: true@@@",
       "@@@STEP_LOG_LINE@textproto@  timeout_secs: 1800@@@",
       "@@@STEP_LOG_LINE@textproto@  default_service_account: \"service_account\"@@@",
-      "@@@STEP_LOG_LINE@textproto@  pave_from_gcs: true@@@",
       "@@@STEP_LOG_LINE@textproto@}@@@",
       "@@@STEP_LOG_LINE@textproto@gcs_bucket: \"fuchsia-infra\"@@@",
       "@@@STEP_LOG_LINE@textproto@artifact_gcs_bucket: \"fuchsia-infra-artifacts\"@@@",
diff --git a/recipes/fuchsia/build.expected/not_test_in_shards.json b/recipes/fuchsia/build.expected/not_test_in_shards.json
index 82f999b..8dccd2a 100644
--- a/recipes/fuchsia/build.expected/not_test_in_shards.json
+++ b/recipes/fuchsia/build.expected/not_test_in_shards.json
@@ -30,7 +30,6 @@
       "@@@STEP_LOG_LINE@textproto@  swarming_io_timeout_secs: 300@@@",
       "@@@STEP_LOG_LINE@textproto@  timeout_secs: 1800@@@",
       "@@@STEP_LOG_LINE@textproto@  default_service_account: \"service_account\"@@@",
-      "@@@STEP_LOG_LINE@textproto@  pave_from_gcs: true@@@",
       "@@@STEP_LOG_LINE@textproto@}@@@",
       "@@@STEP_LOG_LINE@textproto@artifact_gcs_bucket: \"fuchsia-infra-artifacts\"@@@",
       "@@@STEP_LOG_LINE@textproto@debug_symbol_gcs_bucket: \"debug-symbols\"@@@",
diff --git a/recipes/fuchsia/build.expected/spec_remote_cq.json b/recipes/fuchsia/build.expected/spec_remote_cq.json
index a957440..90cb111 100644
--- a/recipes/fuchsia/build.expected/spec_remote_cq.json
+++ b/recipes/fuchsia/build.expected/spec_remote_cq.json
@@ -133,7 +133,6 @@
       "@@@STEP_LOG_LINE@textproto@  test_in_shards: true@@@",
       "@@@STEP_LOG_LINE@textproto@  timeout_secs: 1800@@@",
       "@@@STEP_LOG_LINE@textproto@  default_service_account: \"service_account\"@@@",
-      "@@@STEP_LOG_LINE@textproto@  pave_from_gcs: true@@@",
       "@@@STEP_LOG_LINE@textproto@}@@@",
       "@@@STEP_LOG_LINE@textproto@artifact_gcs_bucket: \"fuchsia-infra-artifacts\"@@@",
       "@@@STEP_LOG_LINE@textproto@debug_symbol_gcs_bucket: \"debug-symbols\"@@@",
diff --git a/recipes/fuchsia/build.expected/spec_remote_cq_with_spec_revision.json b/recipes/fuchsia/build.expected/spec_remote_cq_with_spec_revision.json
index cbf9e71..74953e2 100644
--- a/recipes/fuchsia/build.expected/spec_remote_cq_with_spec_revision.json
+++ b/recipes/fuchsia/build.expected/spec_remote_cq_with_spec_revision.json
@@ -133,7 +133,6 @@
       "@@@STEP_LOG_LINE@textproto@  test_in_shards: true@@@",
       "@@@STEP_LOG_LINE@textproto@  timeout_secs: 1800@@@",
       "@@@STEP_LOG_LINE@textproto@  default_service_account: \"service_account\"@@@",
-      "@@@STEP_LOG_LINE@textproto@  pave_from_gcs: true@@@",
       "@@@STEP_LOG_LINE@textproto@}@@@",
       "@@@STEP_LOG_LINE@textproto@artifact_gcs_bucket: \"fuchsia-infra-artifacts\"@@@",
       "@@@STEP_LOG_LINE@textproto@debug_symbol_gcs_bucket: \"debug-symbols\"@@@",
diff --git a/recipes/fuchsia/build.py b/recipes/fuchsia/build.py
index b16187c..c663a63 100644
--- a/recipes/fuchsia/build.py
+++ b/recipes/fuchsia/build.py
@@ -256,7 +256,6 @@
           spec.test.swarming_io_timeout_secs,
           spec.test.use_runtests,
           default_service_account=spec.test.default_service_account,
-          pave_from_gcs=spec.test.pave_from_gcs,
           timeout_secs=spec.test.timeout_secs)
     else:
       shard_requests = api.testing_requests.deprecated_shard_requests(
@@ -270,7 +269,6 @@
           .swarming_expiration_timeout_secs,
           swarming_io_timeout_secs=spec.test.swarming_io_timeout_secs,
           default_service_account=spec.test.default_service_account,
-          pave_from_gcs=spec.test.pave_from_gcs,
       )
 
     orchestration_inputs = api.build.TestOrchestrationInputs.from_build_results(
@@ -310,7 +308,6 @@
           swarming_expiration_timeout_secs=10 * 60,
           swarming_io_timeout_secs=5 * 60,
           default_service_account='service_account',
-          pave_from_gcs=True,
       )
 
     spec = Fuchsia(
diff --git a/recipes/fuchsia_perf.py b/recipes/fuchsia_perf.py
index 6666486..458d0ee 100644
--- a/recipes/fuchsia_perf.py
+++ b/recipes/fuchsia_perf.py
@@ -207,7 +207,7 @@
       test_timeout_secs,
       pave,
       default_service_account=test_task_service_account,
-      pave_from_gcs=True)
+  )
   # Must be done after testing.shard_requests() is called, because that
   # modifies the filesystem images. TODO(garymm,joshuaseaton): once legacy_qemu
   # code paths are removed, remove this comment as it will become false.
diff --git a/recipes/fuchsia_perfcompare.py b/recipes/fuchsia_perfcompare.py
index fe89004..17a64a6 100644
--- a/recipes/fuchsia_perfcompare.py
+++ b/recipes/fuchsia_perfcompare.py
@@ -202,7 +202,6 @@
           test_pool,
           test_timeout_secs,
           pave,
-          pave_from_gcs=True,
           default_service_account=test_task_service_account,
       )
       # Must be done after testing.shard_requests() is called, because that