Roll recipe dependencies (nontrivial).

This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (depot_tools) into this repository.

The build that created this CL was
https://ci.chromium.org/b/8809374170709628129

Please review the expectation changes, and LGTM+CQ.

depot_tools:
https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/93fbd989e046cdc2e4bf6a23b5a517e6c4c2d01b
  93fbd98 (jwata@google.com)
      Revert "Retry switching to use CIPD ninja v1.8.2"

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

R=chillers@google.com, fujino@google.com, godofredoc@google.com, keyonghan@google.com

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I35119a66bff54692c989d9db7d164801b605817b
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/31802
Commit-Queue: Keyong Han <keyonghan@google.com>
Reviewed-by: Casey Hillers <chillers@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 7d9b755..5170deb 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -25,7 +25,7 @@
   "deps": {
     "depot_tools": {
       "branch": "refs/heads/main",
-      "revision": "ecb22a6b70d5a44e3e9f7245211b9eac5ae9081a",
+      "revision": "93fbd989e046cdc2e4bf6a23b5a517e6c4c2d01b",
       "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
     },
     "fuchsia": {
diff --git a/recipes/engine/engine.expected/win.json b/recipes/engine/engine.expected/win.json
index 29f4d3e..ace65fd 100644
--- a/recipes/engine/engine.expected/win.json
+++ b/recipes/engine/engine.expected/win.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_font_subset.json b/recipes/engine/engine.expected/win_font_subset.json
index d663130..df092ef 100644
--- a/recipes/engine/engine.expected/win_font_subset.json
+++ b/recipes/engine/engine.expected/win_font_subset.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_no_lto.json b/recipes/engine/engine.expected/win_no_lto.json
index 2256e3c..9f6e8da 100644
--- a/recipes/engine/engine.expected/win_no_lto.json
+++ b/recipes/engine/engine.expected/win_no_lto.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset.json b/recipes/engine/engine.expected/win_no_lto_font_subset.json
index 1823303..ecdf6f3 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_publish_cipd.json b/recipes/engine/engine.expected/win_publish_cipd.json
index 29f4d3e..ace65fd 100644
--- a/recipes/engine/engine.expected/win_publish_cipd.json
+++ b/recipes/engine/engine.expected/win_publish_cipd.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_font_subset.json b/recipes/engine/engine.expected/win_publish_cipd_font_subset.json
index d663130..df092ef 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_font_subset.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_font_subset.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto.json
index 2256e3c..9f6e8da 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json
index 1823303..ecdf6f3 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_upload.json b/recipes/engine/engine.expected/win_upload.json
index 947fc1f..230aa67 100644
--- a/recipes/engine/engine.expected/win_upload.json
+++ b/recipes/engine/engine.expected/win_upload.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_upload_font_subset.json b/recipes/engine/engine.expected/win_upload_font_subset.json
index 56c83b2..da8d65d 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_upload_no_lto.json b/recipes/engine/engine.expected/win_upload_no_lto.json
index 4465a13..321c17a 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json
index 0c2b1e1..685bda3 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd.json b/recipes/engine/engine.expected/win_upload_publish_cipd.json
index 947fc1f..230aa67 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json
index 56c83b2..da8d65d 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json
index 4465a13..321c17a 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
index 0c2b1e1..685bda3 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
@@ -340,49 +340,6 @@
     "cmd": [
       "vpython3",
       "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "cwd": "[CACHE]\\builder",
-    "env": {
-      "ANDROID_HOME": "[CACHE]\\builder\\src\\third_party\\android_tools\\sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\certs",
-        "[CACHE]\\builder\\src\\third_party\\dart\\tools\\sdks\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--spec-path",
       "cache_dir = '[CACHE]\\\\git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
diff --git a/recipes/engine/engine_arm.expected/win.json b/recipes/engine/engine_arm.expected/win.json
index 03d27de..05a7a5b 100644
--- a/recipes/engine/engine_arm.expected/win.json
+++ b/recipes/engine/engine_arm.expected/win.json
@@ -142,35 +142,6 @@
       "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
       "--json-output",
       "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
       "rmcontents",
       "[CACHE]\\builder"
     ],
diff --git a/recipes/engine/engine_arm.expected/win_upload.json b/recipes/engine/engine_arm.expected/win_upload.json
index 03d27de..05a7a5b 100644
--- a/recipes/engine/engine_arm.expected/win_upload.json
+++ b/recipes/engine/engine_arm.expected/win_upload.json
@@ -142,35 +142,6 @@
       "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
       "--json-output",
       "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
       "rmcontents",
       "[CACHE]\\builder"
     ],
diff --git a/recipes/engine/engine_unopt.expected/win.json b/recipes/engine/engine_unopt.expected/win.json
index ed9bcc2..d23aa31 100644
--- a/recipes/engine/engine_unopt.expected/win.json
+++ b/recipes/engine/engine_unopt.expected/win.json
@@ -329,35 +329,6 @@
       "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
       "--json-output",
       "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
       "rmcontents",
       "[CACHE]\\builder"
     ],
diff --git a/recipes/engine/engine_unopt.expected/win_lto.json b/recipes/engine/engine_unopt.expected/win_lto.json
index b9eb8ba..af38abf 100644
--- a/recipes/engine/engine_unopt.expected/win_lto.json
+++ b/recipes/engine/engine_unopt.expected/win_lto.json
@@ -329,35 +329,6 @@
       "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
       "--json-output",
       "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
       "rmcontents",
       "[CACHE]\\builder"
     ],
diff --git a/recipes/engine/web_engine.expected/windows-post-submit.json b/recipes/engine/web_engine.expected/windows-post-submit.json
index 60d5b42..a8e9644 100644
--- a/recipes/engine/web_engine.expected/windows-post-submit.json
+++ b/recipes/engine/web_engine.expected/windows-post-submit.json
@@ -162,23 +162,6 @@
       "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
       "--json-output",
       "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "infra_step": true,
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
       "rmcontents",
       "[CACHE]\\builder"
     ],
diff --git a/recipes/engine/web_engine_drone.expected/windows-post-submit.json b/recipes/engine/web_engine_drone.expected/windows-post-submit.json
index 6d151e4..4798252 100644
--- a/recipes/engine/web_engine_drone.expected/windows-post-submit.json
+++ b/recipes/engine/web_engine_drone.expected/windows-post-submit.json
@@ -94,23 +94,6 @@
       "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
       "--json-output",
       "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "infra_step": true,
-    "name": "Checkout source code.copy depot_tools/.cipd_bin/ninja.exe to depot_tools/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
       "rmcontents",
       "[CLEANUP]\\builder"
     ],
diff --git a/recipes/packaging/packaging.expected/win_beta.json b/recipes/packaging/packaging.expected/win_beta.json
index 303aea1..1a48976 100644
--- a/recipes/packaging/packaging.expected/win_beta.json
+++ b/recipes/packaging/packaging.expected/win_beta.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_beta_cosign.json b/recipes/packaging/packaging.expected/win_beta_cosign.json
index f6d408d..419ae8f 100644
--- a/recipes/packaging/packaging.expected/win_beta_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_cosign.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_beta_experimental.json b/recipes/packaging/packaging.expected/win_beta_experimental.json
index f2e9fc7..7a53a6c 100644
--- a/recipes/packaging/packaging.expected/win_beta_experimental.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_cosign.json b/recipes/packaging/packaging.expected/win_beta_experimental_cosign.json
index b06518f..7b45b07 100644
--- a/recipes/packaging/packaging.expected/win_beta_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_cosign.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_upload.json b/recipes/packaging/packaging.expected/win_beta_experimental_upload.json
index f2e9fc7..7a53a6c 100644
--- a/recipes/packaging/packaging.expected/win_beta_experimental_upload.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_upload.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign.json
index b06518f..7b45b07 100644
--- a/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_experimental_upload_cosign.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_beta_upload.json b/recipes/packaging/packaging.expected/win_beta_upload.json
index 303aea1..1a48976 100644
--- a/recipes/packaging/packaging.expected/win_beta_upload.json
+++ b/recipes/packaging/packaging.expected/win_beta_upload.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_beta_upload_cosign.json b/recipes/packaging/packaging.expected/win_beta_upload_cosign.json
index f6d408d..419ae8f 100644
--- a/recipes/packaging/packaging.expected/win_beta_upload_cosign.json
+++ b/recipes/packaging/packaging.expected/win_beta_upload_cosign.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_master.json b/recipes/packaging/packaging.expected/win_master.json
index 08f2a82..1f367d6 100644
--- a/recipes/packaging/packaging.expected/win_master.json
+++ b/recipes/packaging/packaging.expected/win_master.json
@@ -476,49 +476,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
     "failure": {
       "failure": {},
       "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
diff --git a/recipes/packaging/packaging.expected/win_master_cosign.json b/recipes/packaging/packaging.expected/win_master_cosign.json
index 08f2a82..1f367d6 100644
--- a/recipes/packaging/packaging.expected/win_master_cosign.json
+++ b/recipes/packaging/packaging.expected/win_master_cosign.json
@@ -476,49 +476,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
     "failure": {
       "failure": {},
       "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
diff --git a/recipes/packaging/packaging.expected/win_master_experimental.json b/recipes/packaging/packaging.expected/win_master_experimental.json
index 08f2a82..1f367d6 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental.json
@@ -476,49 +476,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
     "failure": {
       "failure": {},
       "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
diff --git a/recipes/packaging/packaging.expected/win_master_experimental_cosign.json b/recipes/packaging/packaging.expected/win_master_experimental_cosign.json
index 08f2a82..1f367d6 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_cosign.json
@@ -476,49 +476,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
     "failure": {
       "failure": {},
       "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload.json b/recipes/packaging/packaging.expected/win_master_experimental_upload.json
index 08f2a82..1f367d6 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_upload.json
@@ -476,49 +476,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
     "failure": {
       "failure": {},
       "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
diff --git a/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign.json
index 08f2a82..1f367d6 100644
--- a/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign.json
+++ b/recipes/packaging/packaging.expected/win_master_experimental_upload_cosign.json
@@ -476,49 +476,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
     "failure": {
       "failure": {},
       "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
diff --git a/recipes/packaging/packaging.expected/win_master_upload.json b/recipes/packaging/packaging.expected/win_master_upload.json
index 08f2a82..1f367d6 100644
--- a/recipes/packaging/packaging.expected/win_master_upload.json
+++ b/recipes/packaging/packaging.expected/win_master_upload.json
@@ -476,49 +476,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
     "failure": {
       "failure": {},
       "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
diff --git a/recipes/packaging/packaging.expected/win_master_upload_cosign.json b/recipes/packaging/packaging.expected/win_master_upload_cosign.json
index 08f2a82..1f367d6 100644
--- a/recipes/packaging/packaging.expected/win_master_upload_cosign.json
+++ b/recipes/packaging/packaging.expected/win_master_upload_cosign.json
@@ -476,49 +476,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
     "failure": {
       "failure": {},
       "humanReason": "could not determine the release branch: either \"release_ref\" or \"git_ref\" properties should be set when manually triggering builds"
diff --git a/recipes/packaging/packaging.expected/win_stable.json b/recipes/packaging/packaging.expected/win_stable.json
index bbb8f43..bc3cee6 100644
--- a/recipes/packaging/packaging.expected/win_stable.json
+++ b/recipes/packaging/packaging.expected/win_stable.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_stable_cosign.json b/recipes/packaging/packaging.expected/win_stable_cosign.json
index f99cf36..b0999d4 100644
--- a/recipes/packaging/packaging.expected/win_stable_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_cosign.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental.json b/recipes/packaging/packaging.expected/win_stable_experimental.json
index 5d206ff..030ed59 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json b/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
index a3a295c..39a4a11 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_cosign.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_upload.json b/recipes/packaging/packaging.expected/win_stable_experimental_upload.json
index 5d206ff..030ed59 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_upload.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_upload.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign.json b/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign.json
index a3a295c..39a4a11 100644
--- a/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_experimental_upload_cosign.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_stable_upload.json b/recipes/packaging/packaging.expected/win_stable_upload.json
index bbb8f43..bc3cee6 100644
--- a/recipes/packaging/packaging.expected/win_stable_upload.json
+++ b/recipes/packaging/packaging.expected/win_stable_upload.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],
diff --git a/recipes/packaging/packaging.expected/win_stable_upload_cosign.json b/recipes/packaging/packaging.expected/win_stable_upload_cosign.json
index f99cf36..b0999d4 100644
--- a/recipes/packaging/packaging.expected/win_stable_upload_cosign.json
+++ b/recipes/packaging/packaging.expected/win_stable_upload_cosign.json
@@ -477,49 +477,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "RECIPE_REPO[depot_tools]\\.cipd_bin\\ninja.exe",
-      "RECIPE_REPO[depot_tools]\\ninja.exe"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy depot_tools/.cipd_bin/ninja.exe to depot_tools/"
-  },
-  {
-    "cmd": [
       "flutter.bat",
       "doctor"
     ],