Use ninja from cipd.

Ninja is not included anymore in the depot_utils api and we need to
force migrate to use ninja from a cipd package.

Change-Id: Idabe36f2f8939d49d3061e103d5613f0b488fef1
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/38560
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index ffb6176..9f8fd94 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -23,17 +23,17 @@
   "deps": {
     "depot_tools": {
       "branch": "refs/heads/main",
-      "revision": "b7d8efd8bee494f4cfacacc19cf50fc4d4be3900",
+      "revision": "5ed21de943cd7c9e877f63b099609f71171533ae",
       "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
     },
     "fuchsia": {
       "branch": "refs/heads/main",
-      "revision": "756991b266319790a416faa085f151d5c5b37d89",
+      "revision": "94fe4c06236472d0bf28c50d4f44b9a110c45f75",
       "url": "https://fuchsia.googlesource.com/infra/recipes.git"
     },
     "recipe_engine": {
       "branch": "refs/heads/main",
-      "revision": "b34c3ccc07617fbbe0f2e7ab348f2ec7e4ac86a0",
+      "revision": "030e1286cc84be214129a6b48dd5f870d62d0090",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipe_modules/sdk/examples/full.expected/ensure_arm_sdk.json b/recipe_modules/sdk/examples/full.expected/ensure_arm_sdk.json
index eea19c6..0ab686b 100644
--- a/recipe_modules/sdk/examples/full.expected/ensure_arm_sdk.json
+++ b/recipe_modules/sdk/examples/full.expected/ensure_arm_sdk.json
@@ -124,9 +124,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -304,9 +301,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -377,9 +371,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -473,9 +464,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -557,9 +545,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipe_modules/sdk/examples/full.expected/ensure_intel_sdk.json b/recipe_modules/sdk/examples/full.expected/ensure_intel_sdk.json
index 27bb7a8..698e91a 100644
--- a/recipe_modules/sdk/examples/full.expected/ensure_intel_sdk.json
+++ b/recipe_modules/sdk/examples/full.expected/ensure_intel_sdk.json
@@ -124,9 +124,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -304,9 +301,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -377,9 +371,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -473,9 +464,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -557,9 +545,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipe_modules/sdk/examples/full.expected/has_cache_sdk.json b/recipe_modules/sdk/examples/full.expected/has_cache_sdk.json
index 82c0f98..ac23543 100644
--- a/recipe_modules/sdk/examples/full.expected/has_cache_sdk.json
+++ b/recipe_modules/sdk/examples/full.expected/has_cache_sdk.json
@@ -190,9 +190,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -347,9 +344,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -443,9 +437,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -527,9 +518,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipe_modules/sdk/examples/full.expected/missing_package_file.json b/recipe_modules/sdk/examples/full.expected/missing_package_file.json
index 58855eb..357dcfb 100644
--- a/recipe_modules/sdk/examples/full.expected/missing_package_file.json
+++ b/recipe_modules/sdk/examples/full.expected/missing_package_file.json
@@ -190,9 +190,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipe_modules/status_reporting/__pycache__/api.cpython-38.pyc.4579254064 b/recipe_modules/status_reporting/__pycache__/api.cpython-38.pyc.4579254064
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/recipe_modules/status_reporting/__pycache__/api.cpython-38.pyc.4579254064
diff --git a/recipe_modules/status_reporting/examples/full.expected/basic.json b/recipe_modules/status_reporting/examples/full.expected/basic.json
index 4b7ec7a..b08e2a0 100644
--- a/recipe_modules/status_reporting/examples/full.expected/basic.json
+++ b/recipe_modules/status_reporting/examples/full.expected/basic.json
@@ -89,8 +89,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipe_modules/vdl/examples/full.expected/ensure_vdl.json b/recipe_modules/vdl/examples/full.expected/ensure_vdl.json
index fa24d6f..e96c7e2 100644
--- a/recipe_modules/vdl/examples/full.expected/ensure_vdl.json
+++ b/recipe_modules/vdl/examples/full.expected/ensure_vdl.json
@@ -297,9 +297,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -477,9 +474,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -550,9 +544,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -623,9 +614,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -740,9 +728,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json b/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json
index 9c3b448..e667462 100644
--- a/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json
+++ b/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json
@@ -788,8 +788,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "compute",
       "images",
       "describe-from-family",
diff --git a/recipes/contrib/salt_packer_base_image_roller.expected/update.json b/recipes/contrib/salt_packer_base_image_roller.expected/update.json
index 262044a..5ee31e5 100644
--- a/recipes/contrib/salt_packer_base_image_roller.expected/update.json
+++ b/recipes/contrib/salt_packer_base_image_roller.expected/update.json
@@ -788,8 +788,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "compute",
       "images",
       "describe-from-family",
diff --git a/recipes/engine/engine.expected/Linux Fuchsia failing test.json b/recipes/engine/engine.expected/Linux Fuchsia failing test.json
index 43c4ce9..4f74640 100644
--- a/recipes/engine/engine.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine/engine.expected/Linux Fuchsia failing test.json
@@ -690,7 +690,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1358,7 +1358,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
diff --git a/recipes/engine/engine.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine/engine.expected/Linux Fuchsia skips on duplicate.json
index 293e098..0fbe4ea 100644
--- a/recipes/engine/engine.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine/engine.expected/Linux Fuchsia skips on duplicate.json
@@ -1245,7 +1245,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1963,7 +1963,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4201,8 +4201,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/clobber.json b/recipes/engine/engine.expected/clobber.json
index dbd0050..4dd9fd7 100644
--- a/recipes/engine/engine.expected/clobber.json
+++ b/recipes/engine/engine.expected/clobber.json
@@ -992,7 +992,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1628,7 +1628,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -2074,7 +2074,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -2567,7 +2567,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -3060,7 +3060,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -4409,7 +4409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -4855,7 +4855,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -5301,7 +5301,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -6139,7 +6139,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -6630,7 +6630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -7257,7 +7257,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -7748,7 +7748,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -8462,7 +8462,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -9126,7 +9126,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -9790,7 +9790,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -10410,7 +10410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -11810,7 +11810,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -15730,7 +15730,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -16272,7 +16272,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -18016,8 +18016,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/experimental.json b/recipes/engine/engine.expected/experimental.json
index ab3971f..8530122 100644
--- a/recipes/engine/engine.expected/experimental.json
+++ b/recipes/engine/engine.expected/experimental.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15600,7 +15600,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16142,7 +16142,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17886,8 +17886,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/experimental_upload.json b/recipes/engine/engine.expected/experimental_upload.json
index 8afd373..6547219 100644
--- a/recipes/engine/engine.expected/experimental_upload.json
+++ b/recipes/engine/engine.expected/experimental_upload.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9166,7 +9166,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10034,7 +10034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10902,7 +10902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11879,7 +11879,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13428,7 +13428,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19526,7 +19526,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20068,7 +20068,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22130,8 +22130,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/fail_android_aot_sharded_builds.json b/recipes/engine/engine.expected/fail_android_aot_sharded_builds.json
index b543022..11bb3ee 100644
--- a/recipes/engine/engine.expected/fail_android_aot_sharded_builds.json
+++ b/recipes/engine/engine.expected/fail_android_aot_sharded_builds.json
@@ -755,7 +755,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1459,7 +1459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
diff --git a/recipes/engine/engine.expected/gcloud_pubsub_failure.json b/recipes/engine/engine.expected/gcloud_pubsub_failure.json
index 5009806..205e42b 100644
--- a/recipes/engine/engine.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine/engine.expected/gcloud_pubsub_failure.json
@@ -882,7 +882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1518,7 +1518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1964,7 +1964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -2457,7 +2457,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -2950,7 +2950,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -4299,7 +4299,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -4745,7 +4745,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -5191,7 +5191,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -6029,7 +6029,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -6520,7 +6520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -7147,7 +7147,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -7638,7 +7638,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -8352,7 +8352,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -9016,7 +9016,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -9680,7 +9680,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -10300,7 +10300,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -11700,7 +11700,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -15620,7 +15620,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -16162,7 +16162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -17906,8 +17906,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_flutter.json b/recipes/engine/engine.expected/linux_flutter.json
index fce6782..061f059 100644
--- a/recipes/engine/engine.expected/linux_flutter.json
+++ b/recipes/engine/engine.expected/linux_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_font_subset_flutter.json b/recipes/engine/engine.expected/linux_font_subset_flutter.json
index fce6782..061f059 100644
--- a/recipes/engine/engine.expected/linux_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_font_subset_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_font_subset_prod.json b/recipes/engine/engine.expected/linux_font_subset_prod.json
index 115f8d3..ba3b2cc 100644
--- a/recipes/engine/engine.expected/linux_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_font_subset_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_font_subset_staging.json b/recipes/engine/engine.expected/linux_font_subset_staging.json
index e7c6078..0197c3a 100644
--- a/recipes/engine/engine.expected/linux_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_font_subset_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_flutter.json b/recipes/engine/engine.expected/linux_maven_flutter.json
index fce6782..061f059 100644
--- a/recipes/engine/engine.expected/linux_maven_flutter.json
+++ b/recipes/engine/engine.expected/linux_maven_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_font_subset_flutter.json b/recipes/engine/engine.expected/linux_maven_font_subset_flutter.json
index fce6782..061f059 100644
--- a/recipes/engine/engine.expected/linux_maven_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_maven_font_subset_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_font_subset_prod.json b/recipes/engine/engine.expected/linux_maven_font_subset_prod.json
index 115f8d3..ba3b2cc 100644
--- a/recipes/engine/engine.expected/linux_maven_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_maven_font_subset_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_font_subset_staging.json b/recipes/engine/engine.expected/linux_maven_font_subset_staging.json
index e7c6078..0197c3a 100644
--- a/recipes/engine/engine.expected/linux_maven_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_maven_font_subset_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_flutter.json b/recipes/engine/engine.expected/linux_maven_no_lto_flutter.json
index d226964..c69ec9b 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter.json
index d226964..c69ec9b 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod.json
index 88d6489..8643711 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging.json
index fc48c31..6994b87 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_prod.json b/recipes/engine/engine.expected/linux_maven_no_lto_prod.json
index 88d6489..8643711 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_prod.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_staging.json b/recipes/engine/engine.expected/linux_maven_no_lto_staging.json
index fc48c31..6994b87 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_staging.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_prod.json b/recipes/engine/engine.expected/linux_maven_prod.json
index 115f8d3..ba3b2cc 100644
--- a/recipes/engine/engine.expected/linux_maven_prod.json
+++ b/recipes/engine/engine.expected/linux_maven_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_flutter.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_flutter.json
index fce6782..061f059 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_flutter.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_flutter.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_flutter.json
index fce6782..061f059 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_prod.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_prod.json
index 115f8d3..ba3b2cc 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_staging.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_staging.json
index e7c6078..0197c3a 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_font_subset_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_flutter.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_flutter.json
index d226964..c69ec9b 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_flutter.json
index d226964..c69ec9b 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_prod.json
index 88d6489..8643711 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_staging.json
index fc48c31..6994b87 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_font_subset_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_prod.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_prod.json
index 88d6489..8643711 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_prod.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_staging.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_staging.json
index fc48c31..6994b87 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_staging.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_no_lto_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_prod.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_prod.json
index 115f8d3..ba3b2cc 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_prod.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_publish_cipd_staging.json b/recipes/engine/engine.expected/linux_maven_publish_cipd_staging.json
index e7c6078..0197c3a 100644
--- a/recipes/engine/engine.expected/linux_maven_publish_cipd_staging.json
+++ b/recipes/engine/engine.expected/linux_maven_publish_cipd_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_maven_staging.json b/recipes/engine/engine.expected/linux_maven_staging.json
index e7c6078..0197c3a 100644
--- a/recipes/engine/engine.expected/linux_maven_staging.json
+++ b/recipes/engine/engine.expected/linux_maven_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_no_lto_flutter.json b/recipes/engine/engine.expected/linux_no_lto_flutter.json
index d226964..c69ec9b 100644
--- a/recipes/engine/engine.expected/linux_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/linux_no_lto_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter.json
index d226964..c69ec9b 100644
--- a/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/linux_no_lto_font_subset_prod.json
index 88d6489..8643711 100644
--- a/recipes/engine/engine.expected/linux_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_no_lto_font_subset_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/linux_no_lto_font_subset_staging.json
index fc48c31..6994b87 100644
--- a/recipes/engine/engine.expected/linux_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_no_lto_font_subset_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_no_lto_prod.json b/recipes/engine/engine.expected/linux_no_lto_prod.json
index 88d6489..8643711 100644
--- a/recipes/engine/engine.expected/linux_no_lto_prod.json
+++ b/recipes/engine/engine.expected/linux_no_lto_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_no_lto_staging.json b/recipes/engine/engine.expected/linux_no_lto_staging.json
index fc48c31..6994b87 100644
--- a/recipes/engine/engine.expected/linux_no_lto_staging.json
+++ b/recipes/engine/engine.expected/linux_no_lto_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_prod.json b/recipes/engine/engine.expected/linux_prod.json
index 115f8d3..ba3b2cc 100644
--- a/recipes/engine/engine.expected/linux_prod.json
+++ b/recipes/engine/engine.expected/linux_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_flutter.json b/recipes/engine/engine.expected/linux_publish_cipd_flutter.json
index fce6782..061f059 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_flutter.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_font_subset_flutter.json b/recipes/engine/engine.expected/linux_publish_cipd_font_subset_flutter.json
index fce6782..061f059 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_font_subset_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_font_subset_prod.json b/recipes/engine/engine.expected/linux_publish_cipd_font_subset_prod.json
index 115f8d3..ba3b2cc 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_font_subset_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_font_subset_staging.json b/recipes/engine/engine.expected/linux_publish_cipd_font_subset_staging.json
index e7c6078..0197c3a 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_font_subset_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_flutter.json b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_flutter.json
index d226964..c69ec9b 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_flutter.json
index d226964..c69ec9b 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_prod.json
index 88d6489..8643711 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_staging.json
index fc48c31..6994b87 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_font_subset_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_prod.json b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_prod.json
index 88d6489..8643711 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_prod.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_staging.json b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_staging.json
index fc48c31..6994b87 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_no_lto_staging.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_no_lto_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4303,7 +4303,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4749,7 +4749,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5195,7 +5195,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6034,7 +6034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6525,7 +6525,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7152,7 +7152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7643,7 +7643,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8357,7 +8357,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9021,7 +9021,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9685,7 +9685,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10305,7 +10305,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11696,7 +11696,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15659,7 +15659,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16201,7 +16201,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17945,8 +17945,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_prod.json b/recipes/engine/engine.expected/linux_publish_cipd_prod.json
index 115f8d3..ba3b2cc 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_prod.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_publish_cipd_staging.json b/recipes/engine/engine.expected/linux_publish_cipd_staging.json
index e7c6078..0197c3a 100644
--- a/recipes/engine/engine.expected/linux_publish_cipd_staging.json
+++ b/recipes/engine/engine.expected/linux_publish_cipd_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_staging.json b/recipes/engine/engine.expected/linux_staging.json
index e7c6078..0197c3a 100644
--- a/recipes/engine/engine.expected/linux_staging.json
+++ b/recipes/engine/engine.expected/linux_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4297,7 +4297,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4743,7 +4743,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5189,7 +5189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6027,7 +6027,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6518,7 +6518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7145,7 +7145,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7636,7 +7636,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8350,7 +8350,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9014,7 +9014,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9678,7 +9678,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10298,7 +10298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11688,7 +11688,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15651,7 +15651,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16193,7 +16193,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -17937,8 +17937,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_flutter.json b/recipes/engine/engine.expected/linux_upload_flutter.json
index 6c5b7ed..bf6187d 100644
--- a/recipes/engine/engine.expected/linux_upload_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9115,7 +9115,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9983,7 +9983,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10851,7 +10851,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11828,7 +11828,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13377,7 +13377,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19526,7 +19526,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20068,7 +20068,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22186,8 +22186,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_font_subset_flutter.json b/recipes/engine/engine.expected/linux_upload_font_subset_flutter.json
index c3657a9..33f6f09 100644
--- a/recipes/engine/engine.expected/linux_upload_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_font_subset_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9166,7 +9166,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10034,7 +10034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10902,7 +10902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11879,7 +11879,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13428,7 +13428,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19577,7 +19577,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20119,7 +20119,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22237,8 +22237,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_font_subset_prod.json b/recipes/engine/engine.expected/linux_upload_font_subset_prod.json
index f4323ef..2888d3b 100644
--- a/recipes/engine/engine.expected/linux_upload_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_font_subset_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9166,7 +9166,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10034,7 +10034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10902,7 +10902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11879,7 +11879,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13428,7 +13428,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19577,7 +19577,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20119,7 +20119,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22237,8 +22237,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_font_subset_staging.json b/recipes/engine/engine.expected/linux_upload_font_subset_staging.json
index 3f42d6b..483b375 100644
--- a/recipes/engine/engine.expected/linux_upload_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_font_subset_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9166,7 +9166,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10034,7 +10034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10902,7 +10902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11879,7 +11879,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13428,7 +13428,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19577,7 +19577,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20119,7 +20119,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22237,8 +22237,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_flutter.json b/recipes/engine/engine.expected/linux_upload_maven_flutter.json
index 93e3c63..9219eac 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9013,7 +9013,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9779,7 +9779,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10545,7 +10545,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11267,7 +11267,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12816,7 +12816,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18029,7 +18029,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18571,7 +18571,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20689,8 +20689,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter.json b/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter.json
index fb7340c..671f3b0 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9064,7 +9064,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9830,7 +9830,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10596,7 +10596,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11318,7 +11318,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12867,7 +12867,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18080,7 +18080,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18622,7 +18622,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20740,8 +20740,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod.json b/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod.json
index e872a31..bd013f6 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9064,7 +9064,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9830,7 +9830,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10596,7 +10596,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11318,7 +11318,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12867,7 +12867,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18080,7 +18080,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18622,7 +18622,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20740,8 +20740,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging.json b/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging.json
index 852d7d4..db724fa 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9064,7 +9064,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9830,7 +9830,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10596,7 +10596,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11318,7 +11318,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12867,7 +12867,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18080,7 +18080,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18622,7 +18622,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20740,8 +20740,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter.json
index 83daa77..cfdaa68 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9020,7 +9020,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9786,7 +9786,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10552,7 +10552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11274,7 +11274,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12824,7 +12824,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18037,7 +18037,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18579,7 +18579,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20697,8 +20697,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter.json
index 27466d7..c566460 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9071,7 +9071,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9837,7 +9837,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10603,7 +10603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11325,7 +11325,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12875,7 +12875,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18088,7 +18088,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18630,7 +18630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20748,8 +20748,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod.json
index c6100e7..955298e 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9071,7 +9071,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9837,7 +9837,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10603,7 +10603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11325,7 +11325,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12875,7 +12875,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18088,7 +18088,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18630,7 +18630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20748,8 +20748,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging.json
index 9171292..a2f66b0 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9071,7 +9071,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9837,7 +9837,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10603,7 +10603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11325,7 +11325,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12875,7 +12875,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18088,7 +18088,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18630,7 +18630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20748,8 +20748,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod.json
index 7caac4d..b2f2f93 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9020,7 +9020,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9786,7 +9786,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10552,7 +10552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11274,7 +11274,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12824,7 +12824,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18037,7 +18037,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18579,7 +18579,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20697,8 +20697,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging.json
index 5c3b24e..4117775 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9020,7 +9020,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9786,7 +9786,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10552,7 +10552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11274,7 +11274,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12824,7 +12824,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18037,7 +18037,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18579,7 +18579,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20697,8 +20697,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_prod.json b/recipes/engine/engine.expected/linux_upload_maven_prod.json
index 4a9fe5c..eb3cf20 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9013,7 +9013,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9779,7 +9779,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10545,7 +10545,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11267,7 +11267,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12816,7 +12816,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18029,7 +18029,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18571,7 +18571,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20689,8 +20689,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_flutter.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_flutter.json
index f3749ca..db34a33 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9013,7 +9013,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9779,7 +9779,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10545,7 +10545,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11267,7 +11267,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12816,7 +12816,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18029,7 +18029,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18571,7 +18571,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20687,8 +20687,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_flutter.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_flutter.json
index bcced40..bb8bf39 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9064,7 +9064,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9830,7 +9830,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10596,7 +10596,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11318,7 +11318,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12867,7 +12867,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18080,7 +18080,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18622,7 +18622,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20738,8 +20738,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_prod.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_prod.json
index 4dd2142..9ca5812 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9064,7 +9064,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9830,7 +9830,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10596,7 +10596,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11318,7 +11318,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12867,7 +12867,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18080,7 +18080,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18622,7 +18622,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20738,8 +20738,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_staging.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_staging.json
index 391908a..7f0adda 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_font_subset_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9064,7 +9064,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9830,7 +9830,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10596,7 +10596,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11318,7 +11318,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12867,7 +12867,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18080,7 +18080,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18622,7 +18622,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20738,8 +20738,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_flutter.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_flutter.json
index 9d3a5ac..c925078 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9020,7 +9020,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9786,7 +9786,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10552,7 +10552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11274,7 +11274,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12824,7 +12824,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18037,7 +18037,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18579,7 +18579,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20695,8 +20695,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_flutter.json
index 54f3f98..7c930e1 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9071,7 +9071,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9837,7 +9837,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10603,7 +10603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11325,7 +11325,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12875,7 +12875,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18088,7 +18088,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18630,7 +18630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20746,8 +20746,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_prod.json
index a4c575b..08cc8f4 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9071,7 +9071,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9837,7 +9837,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10603,7 +10603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11325,7 +11325,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12875,7 +12875,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18088,7 +18088,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18630,7 +18630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20746,8 +20746,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_staging.json
index 0308b50..bfa97d6 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9071,7 +9071,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9837,7 +9837,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10603,7 +10603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11325,7 +11325,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12875,7 +12875,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18088,7 +18088,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18630,7 +18630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20746,8 +20746,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_prod.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_prod.json
index fdf1279..4c1c1d1 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9020,7 +9020,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9786,7 +9786,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10552,7 +10552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11274,7 +11274,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12824,7 +12824,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18037,7 +18037,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18579,7 +18579,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20695,8 +20695,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_staging.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_staging.json
index 935dc7e..e25f839 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_no_lto_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9020,7 +9020,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9786,7 +9786,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10552,7 +10552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11274,7 +11274,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12824,7 +12824,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18037,7 +18037,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18579,7 +18579,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20695,8 +20695,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_prod.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_prod.json
index 1a41a64..9e2558e 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9013,7 +9013,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9779,7 +9779,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10545,7 +10545,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11267,7 +11267,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12816,7 +12816,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18029,7 +18029,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18571,7 +18571,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20687,8 +20687,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_staging.json b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_staging.json
index b98d167..b62c3c8 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_publish_cipd_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9013,7 +9013,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9779,7 +9779,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10545,7 +10545,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11267,7 +11267,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12816,7 +12816,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18029,7 +18029,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18571,7 +18571,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20687,8 +20687,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_maven_staging.json b/recipes/engine/engine.expected/linux_upload_maven_staging.json
index 2da7cce..2cb7695 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9013,7 +9013,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9779,7 +9779,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10545,7 +10545,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11267,7 +11267,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12816,7 +12816,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18029,7 +18029,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18571,7 +18571,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20689,8 +20689,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_flutter.json b/recipes/engine/engine.expected/linux_upload_no_lto_flutter.json
index b3cd2d4..b982d99 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9122,7 +9122,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9990,7 +9990,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10858,7 +10858,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11835,7 +11835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13385,7 +13385,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19534,7 +19534,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20076,7 +20076,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22194,8 +22194,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter.json
index 5867151..1d6e3c9 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9173,7 +9173,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10041,7 +10041,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10909,7 +10909,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13436,7 +13436,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19585,7 +19585,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20127,7 +20127,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22245,8 +22245,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod.json
index 1109db2..c2a4db2 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9173,7 +9173,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10041,7 +10041,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10909,7 +10909,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13436,7 +13436,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19585,7 +19585,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20127,7 +20127,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22245,8 +22245,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging.json
index 26f52e4..d4aa0ed 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9173,7 +9173,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10041,7 +10041,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10909,7 +10909,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13436,7 +13436,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19585,7 +19585,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20127,7 +20127,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22245,8 +22245,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_prod.json b/recipes/engine/engine.expected/linux_upload_no_lto_prod.json
index 6e04865..e2ed4d3 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9122,7 +9122,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9990,7 +9990,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10858,7 +10858,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11835,7 +11835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13385,7 +13385,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19534,7 +19534,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20076,7 +20076,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22194,8 +22194,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_staging.json b/recipes/engine/engine.expected/linux_upload_no_lto_staging.json
index 745e6ab..24f1a38 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9122,7 +9122,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9990,7 +9990,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10858,7 +10858,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11835,7 +11835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13385,7 +13385,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19534,7 +19534,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20076,7 +20076,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22194,8 +22194,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_prod.json b/recipes/engine/engine.expected/linux_upload_prod.json
index adb6db0..1565755 100644
--- a/recipes/engine/engine.expected/linux_upload_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9115,7 +9115,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9983,7 +9983,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10851,7 +10851,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11828,7 +11828,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13377,7 +13377,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19526,7 +19526,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20068,7 +20068,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22186,8 +22186,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_flutter.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_flutter.json
index 7ed23d3..5a4a8d8 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9115,7 +9115,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9983,7 +9983,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10851,7 +10851,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11828,7 +11828,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13377,7 +13377,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19526,7 +19526,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20068,7 +20068,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22184,8 +22184,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_flutter.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_flutter.json
index 520977d..4cf3807 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_flutter.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9166,7 +9166,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10034,7 +10034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10902,7 +10902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11879,7 +11879,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13428,7 +13428,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19577,7 +19577,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20119,7 +20119,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22235,8 +22235,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_prod.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_prod.json
index 687ad4c..ad64416 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9166,7 +9166,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10034,7 +10034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10902,7 +10902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11879,7 +11879,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13428,7 +13428,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19577,7 +19577,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20119,7 +20119,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22235,8 +22235,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_staging.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_staging.json
index f216860..95efee9 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_font_subset_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4654,7 +4654,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5100,7 +5100,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5546,7 +5546,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6588,7 +6588,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7079,7 +7079,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8248,7 +8248,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9166,7 +9166,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10034,7 +10034,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10902,7 +10902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11879,7 +11879,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13428,7 +13428,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19577,7 +19577,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20119,7 +20119,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22235,8 +22235,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_flutter.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_flutter.json
index 55a1012..607cb69 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9122,7 +9122,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9990,7 +9990,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10858,7 +10858,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11835,7 +11835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13385,7 +13385,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19534,7 +19534,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20076,7 +20076,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22192,8 +22192,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_flutter.json
index 7b0be4f..07550f5 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_flutter.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9173,7 +9173,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10041,7 +10041,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10909,7 +10909,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13436,7 +13436,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19585,7 +19585,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20127,7 +20127,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22243,8 +22243,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_prod.json
index c459723..44ccd95 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9173,7 +9173,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10041,7 +10041,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10909,7 +10909,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13436,7 +13436,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19585,7 +19585,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20127,7 +20127,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22243,8 +22243,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_staging.json
index bb5443e..5560515 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_font_subset_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4660,7 +4660,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5106,7 +5106,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5552,7 +5552,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6595,7 +6595,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7086,7 +7086,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7764,7 +7764,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8255,7 +8255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9173,7 +9173,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10041,7 +10041,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10909,7 +10909,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13436,7 +13436,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19585,7 +19585,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20127,7 +20127,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22243,8 +22243,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_prod.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_prod.json
index 9e4e7b1..849b40f 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_prod.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9122,7 +9122,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9990,7 +9990,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10858,7 +10858,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11835,7 +11835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13385,7 +13385,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19534,7 +19534,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20076,7 +20076,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22192,8 +22192,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_staging.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_staging.json
index 767953a..8504640 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_no_lto_staging.json
@@ -884,7 +884,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1520,7 +1520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1966,7 +1966,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2459,7 +2459,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2952,7 +2952,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4609,7 +4609,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5055,7 +5055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5501,7 +5501,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6544,7 +6544,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7035,7 +7035,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7713,7 +7713,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8204,7 +8204,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9122,7 +9122,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9990,7 +9990,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10858,7 +10858,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11835,7 +11835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13385,7 +13385,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19534,7 +19534,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20076,7 +20076,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22192,8 +22192,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_prod.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_prod.json
index b11a5d8..7c7fd1e 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_prod.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_prod.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9115,7 +9115,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9983,7 +9983,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10851,7 +10851,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11828,7 +11828,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13377,7 +13377,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19526,7 +19526,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20068,7 +20068,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22184,8 +22184,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_publish_cipd_staging.json b/recipes/engine/engine.expected/linux_upload_publish_cipd_staging.json
index c2c1d51..8e1bd31 100644
--- a/recipes/engine/engine.expected/linux_upload_publish_cipd_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_publish_cipd_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9115,7 +9115,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9983,7 +9983,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10851,7 +10851,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11828,7 +11828,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13377,7 +13377,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19526,7 +19526,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20068,7 +20068,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22184,8 +22184,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/linux_upload_staging.json b/recipes/engine/engine.expected/linux_upload_staging.json
index 77a4863..e517482 100644
--- a/recipes/engine/engine.expected/linux_upload_staging.json
+++ b/recipes/engine/engine.expected/linux_upload_staging.json
@@ -880,7 +880,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1516,7 +1516,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1962,7 +1962,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2455,7 +2455,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2948,7 +2948,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4603,7 +4603,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5049,7 +5049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -5495,7 +5495,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6537,7 +6537,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7028,7 +7028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7706,7 +7706,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8197,7 +8197,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9115,7 +9115,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9983,7 +9983,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10851,7 +10851,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11828,7 +11828,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13377,7 +13377,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -19526,7 +19526,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -20068,7 +20068,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -22186,8 +22186,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_flutter.json b/recipes/engine/engine.expected/mac_flutter.json
index 3cc89e2..b839fdd 100644
--- a/recipes/engine/engine.expected/mac_flutter.json
+++ b/recipes/engine/engine.expected/mac_flutter.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_font_subset_flutter.json b/recipes/engine/engine.expected/mac_font_subset_flutter.json
index 3cc89e2..b839fdd 100644
--- a/recipes/engine/engine.expected/mac_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/mac_font_subset_flutter.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_font_subset_prod.json b/recipes/engine/engine.expected/mac_font_subset_prod.json
index abe03c1..07b0bb9 100644
--- a/recipes/engine/engine.expected/mac_font_subset_prod.json
+++ b/recipes/engine/engine.expected/mac_font_subset_prod.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_font_subset_staging.json b/recipes/engine/engine.expected/mac_font_subset_staging.json
index 250a6bd..545036b 100644
--- a/recipes/engine/engine.expected/mac_font_subset_staging.json
+++ b/recipes/engine/engine.expected/mac_font_subset_staging.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_no_lto_flutter.json b/recipes/engine/engine.expected/mac_no_lto_flutter.json
index b8053db..44da41f 100644
--- a/recipes/engine/engine.expected/mac_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/mac_no_lto_flutter.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter.json
index b8053db..44da41f 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_prod.json
index b935610..cd2f12d 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_prod.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_staging.json
index 5e2e00b..b4d19c6 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_staging.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_no_lto_prod.json b/recipes/engine/engine.expected/mac_no_lto_prod.json
index b935610..cd2f12d 100644
--- a/recipes/engine/engine.expected/mac_no_lto_prod.json
+++ b/recipes/engine/engine.expected/mac_no_lto_prod.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_no_lto_staging.json b/recipes/engine/engine.expected/mac_no_lto_staging.json
index 5e2e00b..b4d19c6 100644
--- a/recipes/engine/engine.expected/mac_no_lto_staging.json
+++ b/recipes/engine/engine.expected/mac_no_lto_staging.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_prod.json b/recipes/engine/engine.expected/mac_prod.json
index abe03c1..07b0bb9 100644
--- a/recipes/engine/engine.expected/mac_prod.json
+++ b/recipes/engine/engine.expected/mac_prod.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_flutter.json b/recipes/engine/engine.expected/mac_publish_cipd_flutter.json
index 3cc89e2..b839fdd 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_flutter.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_flutter.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter.json b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter.json
index 3cc89e2..b839fdd 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_flutter.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod.json b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod.json
index abe03c1..07b0bb9 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_prod.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging.json b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging.json
index 250a6bd..545036b 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_font_subset_staging.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter.json
index b8053db..44da41f 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_flutter.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter.json
index b8053db..44da41f 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_flutter.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod.json
index b935610..cd2f12d 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_prod.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging.json
index 5e2e00b..b4d19c6 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset_staging.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod.json
index b935610..cd2f12d 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_prod.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging.json
index 5e2e00b..b4d19c6 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_staging.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6924,7 +6924,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7371,7 +7371,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7818,7 +7818,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8265,7 +8265,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8712,7 +8712,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9159,7 +9159,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10174,7 +10174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10669,7 +10669,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11162,7 +11162,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12152,7 +12152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12822,7 +12822,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14091,7 +14091,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14586,7 +14586,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16632,8 +16632,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_prod.json b/recipes/engine/engine.expected/mac_publish_cipd_prod.json
index abe03c1..07b0bb9 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_prod.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_prod.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_staging.json b/recipes/engine/engine.expected/mac_publish_cipd_staging.json
index 250a6bd..545036b 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_staging.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_staging.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_staging.json b/recipes/engine/engine.expected/mac_staging.json
index 250a6bd..545036b 100644
--- a/recipes/engine/engine.expected/mac_staging.json
+++ b/recipes/engine/engine.expected/mac_staging.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -6917,7 +6917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7364,7 +7364,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7811,7 +7811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8258,7 +8258,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8705,7 +8705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9152,7 +9152,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10167,7 +10167,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10662,7 +10662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11154,7 +11154,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12143,7 +12143,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12812,7 +12812,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14081,7 +14081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14576,7 +14576,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16622,8 +16622,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_flutter.json b/recipes/engine/engine.expected/mac_upload_flutter.json
index b14d030..4d72675 100644
--- a/recipes/engine/engine.expected/mac_upload_flutter.json
+++ b/recipes/engine/engine.expected/mac_upload_flutter.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7733,7 +7733,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8180,7 +8180,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8627,7 +8627,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9074,7 +9074,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9521,7 +9521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9968,7 +9968,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11289,7 +11289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11784,7 +11784,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12276,7 +12276,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13367,7 +13367,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14087,7 +14087,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15458,7 +15458,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15953,7 +15953,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18373,8 +18373,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_flutter.json b/recipes/engine/engine.expected/mac_upload_font_subset_flutter.json
index 6e74653..1c59006 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_flutter.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7835,7 +7835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8282,7 +8282,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8729,7 +8729,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9176,7 +9176,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9623,7 +9623,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10070,7 +10070,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11391,7 +11391,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12378,7 +12378,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13469,7 +13469,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14189,7 +14189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15560,7 +15560,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16055,7 +16055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18475,8 +18475,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_prod.json b/recipes/engine/engine.expected/mac_upload_font_subset_prod.json
index 4782bfb..1c6ed11 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_prod.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_prod.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7835,7 +7835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8282,7 +8282,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8729,7 +8729,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9176,7 +9176,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9623,7 +9623,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10070,7 +10070,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11391,7 +11391,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12378,7 +12378,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13469,7 +13469,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14189,7 +14189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15560,7 +15560,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16055,7 +16055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18475,8 +18475,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_staging.json b/recipes/engine/engine.expected/mac_upload_font_subset_staging.json
index df3837d..72074fd 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_staging.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_staging.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7835,7 +7835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8282,7 +8282,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8729,7 +8729,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9176,7 +9176,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9623,7 +9623,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10070,7 +10070,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11391,7 +11391,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12378,7 +12378,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13469,7 +13469,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14189,7 +14189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15560,7 +15560,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16055,7 +16055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18475,8 +18475,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_flutter.json b/recipes/engine/engine.expected/mac_upload_no_lto_flutter.json
index d93f386..af04119 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_flutter.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7740,7 +7740,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8187,7 +8187,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8634,7 +8634,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9081,7 +9081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9528,7 +9528,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9975,7 +9975,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11296,7 +11296,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11791,7 +11791,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12284,7 +12284,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13376,7 +13376,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14097,7 +14097,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15468,7 +15468,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15963,7 +15963,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18383,8 +18383,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter.json
index 867d309..e6dce4e 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7842,7 +7842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8289,7 +8289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8736,7 +8736,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9183,7 +9183,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9630,7 +9630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10077,7 +10077,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11398,7 +11398,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11893,7 +11893,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12386,7 +12386,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13478,7 +13478,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14199,7 +14199,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15570,7 +15570,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16065,7 +16065,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18485,8 +18485,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod.json
index d164459..bc49583 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7842,7 +7842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8289,7 +8289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8736,7 +8736,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9183,7 +9183,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9630,7 +9630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10077,7 +10077,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11398,7 +11398,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11893,7 +11893,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12386,7 +12386,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13478,7 +13478,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14199,7 +14199,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15570,7 +15570,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16065,7 +16065,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18485,8 +18485,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging.json
index 040af19..d9405cc 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7842,7 +7842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8289,7 +8289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8736,7 +8736,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9183,7 +9183,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9630,7 +9630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10077,7 +10077,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11398,7 +11398,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11893,7 +11893,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12386,7 +12386,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13478,7 +13478,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14199,7 +14199,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15570,7 +15570,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16065,7 +16065,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18485,8 +18485,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_prod.json b/recipes/engine/engine.expected/mac_upload_no_lto_prod.json
index 59f658f..2ba9e10 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_prod.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_prod.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7740,7 +7740,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8187,7 +8187,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8634,7 +8634,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9081,7 +9081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9528,7 +9528,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9975,7 +9975,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11296,7 +11296,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11791,7 +11791,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12284,7 +12284,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13376,7 +13376,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14097,7 +14097,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15468,7 +15468,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15963,7 +15963,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18383,8 +18383,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_staging.json b/recipes/engine/engine.expected/mac_upload_no_lto_staging.json
index e6323a0..ee7df10 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_staging.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_staging.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7740,7 +7740,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8187,7 +8187,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8634,7 +8634,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9081,7 +9081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9528,7 +9528,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9975,7 +9975,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11296,7 +11296,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11791,7 +11791,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12284,7 +12284,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13376,7 +13376,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14097,7 +14097,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15468,7 +15468,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15963,7 +15963,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18383,8 +18383,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_prod.json b/recipes/engine/engine.expected/mac_upload_prod.json
index e8b1522..d9e48cc 100644
--- a/recipes/engine/engine.expected/mac_upload_prod.json
+++ b/recipes/engine/engine.expected/mac_upload_prod.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7733,7 +7733,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8180,7 +8180,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8627,7 +8627,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9074,7 +9074,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9521,7 +9521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9968,7 +9968,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11289,7 +11289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11784,7 +11784,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12276,7 +12276,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13367,7 +13367,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14087,7 +14087,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15458,7 +15458,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15953,7 +15953,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18373,8 +18373,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter.json
index b14d030..4d72675 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_flutter.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7733,7 +7733,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8180,7 +8180,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8627,7 +8627,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9074,7 +9074,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9521,7 +9521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9968,7 +9968,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11289,7 +11289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11784,7 +11784,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12276,7 +12276,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13367,7 +13367,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14087,7 +14087,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15458,7 +15458,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15953,7 +15953,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18373,8 +18373,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter.json
index 6e74653..1c59006 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_flutter.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7835,7 +7835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8282,7 +8282,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8729,7 +8729,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9176,7 +9176,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9623,7 +9623,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10070,7 +10070,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11391,7 +11391,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12378,7 +12378,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13469,7 +13469,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14189,7 +14189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15560,7 +15560,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16055,7 +16055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18475,8 +18475,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod.json
index 4782bfb..1c6ed11 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_prod.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7835,7 +7835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8282,7 +8282,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8729,7 +8729,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9176,7 +9176,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9623,7 +9623,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10070,7 +10070,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11391,7 +11391,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12378,7 +12378,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13469,7 +13469,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14189,7 +14189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15560,7 +15560,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16055,7 +16055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18475,8 +18475,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging.json
index df3837d..72074fd 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset_staging.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7835,7 +7835,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8282,7 +8282,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8729,7 +8729,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9176,7 +9176,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9623,7 +9623,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10070,7 +10070,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11391,7 +11391,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11886,7 +11886,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12378,7 +12378,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13469,7 +13469,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14189,7 +14189,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15560,7 +15560,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16055,7 +16055,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18475,8 +18475,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter.json
index d93f386..af04119 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_flutter.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7740,7 +7740,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8187,7 +8187,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8634,7 +8634,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9081,7 +9081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9528,7 +9528,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9975,7 +9975,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11296,7 +11296,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11791,7 +11791,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12284,7 +12284,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13376,7 +13376,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14097,7 +14097,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15468,7 +15468,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15963,7 +15963,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18383,8 +18383,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter.json
index 867d309..e6dce4e 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_flutter.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7842,7 +7842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8289,7 +8289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8736,7 +8736,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9183,7 +9183,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9630,7 +9630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10077,7 +10077,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11398,7 +11398,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11893,7 +11893,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12386,7 +12386,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13478,7 +13478,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14199,7 +14199,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15570,7 +15570,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16065,7 +16065,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18485,8 +18485,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod.json
index d164459..bc49583 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_prod.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7842,7 +7842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8289,7 +8289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8736,7 +8736,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9183,7 +9183,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9630,7 +9630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10077,7 +10077,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11398,7 +11398,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11893,7 +11893,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12386,7 +12386,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13478,7 +13478,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14199,7 +14199,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15570,7 +15570,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16065,7 +16065,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18485,8 +18485,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging.json
index 040af19..d9405cc 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset_staging.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7842,7 +7842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8289,7 +8289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8736,7 +8736,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9183,7 +9183,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9630,7 +9630,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -10077,7 +10077,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11398,7 +11398,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11893,7 +11893,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12386,7 +12386,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13478,7 +13478,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14199,7 +14199,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15570,7 +15570,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -16065,7 +16065,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18485,8 +18485,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod.json
index 59f658f..2ba9e10 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_prod.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7740,7 +7740,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8187,7 +8187,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8634,7 +8634,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9081,7 +9081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9528,7 +9528,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9975,7 +9975,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11296,7 +11296,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11791,7 +11791,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12284,7 +12284,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13376,7 +13376,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14097,7 +14097,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15468,7 +15468,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15963,7 +15963,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18383,8 +18383,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging.json
index e6323a0..ee7df10 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_staging.json
@@ -1281,7 +1281,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1917,7 +1917,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2410,7 +2410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2903,7 +2903,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3396,7 +3396,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3842,7 +3842,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4288,7 +4288,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7740,7 +7740,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8187,7 +8187,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8634,7 +8634,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9081,7 +9081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9528,7 +9528,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9975,7 +9975,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11296,7 +11296,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11791,7 +11791,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12284,7 +12284,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13376,7 +13376,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14097,7 +14097,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15468,7 +15468,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15963,7 +15963,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18383,8 +18383,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_prod.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_prod.json
index e8b1522..d9e48cc 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_prod.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_prod.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7733,7 +7733,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8180,7 +8180,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8627,7 +8627,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9074,7 +9074,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9521,7 +9521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9968,7 +9968,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11289,7 +11289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11784,7 +11784,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12276,7 +12276,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13367,7 +13367,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14087,7 +14087,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15458,7 +15458,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15953,7 +15953,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18373,8 +18373,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_staging.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_staging.json
index 6a70834..3fa3195 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_staging.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_staging.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7733,7 +7733,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8180,7 +8180,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8627,7 +8627,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9074,7 +9074,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9521,7 +9521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9968,7 +9968,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11289,7 +11289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11784,7 +11784,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12276,7 +12276,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13367,7 +13367,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14087,7 +14087,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15458,7 +15458,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15953,7 +15953,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18373,8 +18373,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/mac_upload_staging.json b/recipes/engine/engine.expected/mac_upload_staging.json
index 6a70834..3fa3195 100644
--- a/recipes/engine/engine.expected/mac_upload_staging.json
+++ b/recipes/engine/engine.expected/mac_upload_staging.json
@@ -1280,7 +1280,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1916,7 +1916,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2409,7 +2409,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2902,7 +2902,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3395,7 +3395,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -3841,7 +3841,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -4287,7 +4287,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -7733,7 +7733,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8180,7 +8180,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -8627,7 +8627,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9074,7 +9074,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9521,7 +9521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -9968,7 +9968,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11289,7 +11289,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -11784,7 +11784,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -12276,7 +12276,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -13367,7 +13367,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -14087,7 +14087,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15458,7 +15458,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -15953,7 +15953,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -18373,8 +18373,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/pull_request.json b/recipes/engine/engine.expected/pull_request.json
index f699e1e..0ebcc2f 100644
--- a/recipes/engine/engine.expected/pull_request.json
+++ b/recipes/engine/engine.expected/pull_request.json
@@ -882,7 +882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1518,7 +1518,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1964,7 +1964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -2457,7 +2457,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -2950,7 +2950,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -4299,7 +4299,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -4745,7 +4745,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -5191,7 +5191,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -6029,7 +6029,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -6520,7 +6520,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -7147,7 +7147,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -7638,7 +7638,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -8352,7 +8352,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -9016,7 +9016,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -9680,7 +9680,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -10300,7 +10300,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -11700,7 +11700,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -15632,7 +15632,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -16174,7 +16174,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -17918,8 +17918,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_flutter.json b/recipes/engine/engine.expected/win_flutter.json
index 5763050..c6b0ee3 100644
--- a/recipes/engine/engine.expected/win_flutter.json
+++ b/recipes/engine/engine.expected/win_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5046,7 +5046,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8776,8 +8776,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_font_subset_flutter.json b/recipes/engine/engine.expected/win_font_subset_flutter.json
index a476d36..0d1d668 100644
--- a/recipes/engine/engine.expected/win_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_font_subset_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7800,7 +7800,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9235,8 +9235,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_font_subset_prod.json b/recipes/engine/engine.expected/win_font_subset_prod.json
index b4d54d4..9f25e00 100644
--- a/recipes/engine/engine.expected/win_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_font_subset_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7800,7 +7800,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9235,8 +9235,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_font_subset_staging.json b/recipes/engine/engine.expected/win_font_subset_staging.json
index 1333a6a..2ba3c72 100644
--- a/recipes/engine/engine.expected/win_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_font_subset_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7800,7 +7800,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9235,8 +9235,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_no_lto_flutter.json b/recipes/engine/engine.expected/win_no_lto_flutter.json
index c594195..c668541 100644
--- a/recipes/engine/engine.expected/win_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/win_no_lto_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5052,7 +5052,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8782,8 +8782,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter.json
index 87cdfb3..6f9d2d3 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7806,7 +7806,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9241,8 +9241,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/win_no_lto_font_subset_prod.json
index c16a9ea..d9ddd0f 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7806,7 +7806,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9241,8 +9241,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/win_no_lto_font_subset_staging.json
index 7b916e2..d9221b5 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7806,7 +7806,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9241,8 +9241,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_no_lto_prod.json b/recipes/engine/engine.expected/win_no_lto_prod.json
index c4c9362..61c0d19 100644
--- a/recipes/engine/engine.expected/win_no_lto_prod.json
+++ b/recipes/engine/engine.expected/win_no_lto_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5052,7 +5052,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8782,8 +8782,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_no_lto_staging.json b/recipes/engine/engine.expected/win_no_lto_staging.json
index 3fa2e56..1bc5f14 100644
--- a/recipes/engine/engine.expected/win_no_lto_staging.json
+++ b/recipes/engine/engine.expected/win_no_lto_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5052,7 +5052,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8782,8 +8782,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_prod.json b/recipes/engine/engine.expected/win_prod.json
index 1b2182e..951f556 100644
--- a/recipes/engine/engine.expected/win_prod.json
+++ b/recipes/engine/engine.expected/win_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5046,7 +5046,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8776,8 +8776,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_flutter.json b/recipes/engine/engine.expected/win_publish_cipd_flutter.json
index 5763050..c6b0ee3 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_flutter.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5046,7 +5046,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8776,8 +8776,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_font_subset_flutter.json b/recipes/engine/engine.expected/win_publish_cipd_font_subset_flutter.json
index a476d36..0d1d668 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_font_subset_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7800,7 +7800,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9235,8 +9235,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_font_subset_prod.json b/recipes/engine/engine.expected/win_publish_cipd_font_subset_prod.json
index b4d54d4..9f25e00 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_font_subset_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7800,7 +7800,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9235,8 +9235,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_font_subset_staging.json b/recipes/engine/engine.expected/win_publish_cipd_font_subset_staging.json
index 1333a6a..2ba3c72 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_font_subset_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7800,7 +7800,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9235,8 +9235,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_flutter.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_flutter.json
index c594195..c668541 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5052,7 +5052,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8782,8 +8782,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_flutter.json
index 87cdfb3..6f9d2d3 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7806,7 +7806,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9241,8 +9241,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_prod.json
index c16a9ea..d9ddd0f 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7806,7 +7806,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9241,8 +9241,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_staging.json
index 7b916e2..d9221b5 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7806,7 +7806,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9241,8 +9241,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_prod.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_prod.json
index c4c9362..61c0d19 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_prod.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5052,7 +5052,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8782,8 +8782,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_staging.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_staging.json
index 3fa2e56..1bc5f14 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_staging.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5052,7 +5052,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5511,7 +5511,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5970,7 +5970,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6429,7 +6429,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6888,7 +6888,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7347,7 +7347,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8782,8 +8782,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_prod.json b/recipes/engine/engine.expected/win_publish_cipd_prod.json
index 1b2182e..951f556 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_prod.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5046,7 +5046,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8776,8 +8776,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_publish_cipd_staging.json b/recipes/engine/engine.expected/win_publish_cipd_staging.json
index a782838..74868b6 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_staging.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5046,7 +5046,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8776,8 +8776,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_staging.json b/recipes/engine/engine.expected/win_staging.json
index a782838..74868b6 100644
--- a/recipes/engine/engine.expected/win_staging.json
+++ b/recipes/engine/engine.expected/win_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5046,7 +5046,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5505,7 +5505,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5964,7 +5964,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6423,7 +6423,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6882,7 +6882,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7341,7 +7341,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8776,8 +8776,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_flutter.json b/recipes/engine/engine.expected/win_upload_flutter.json
index 281807a..0bdec7f 100644
--- a/recipes/engine/engine.expected/win_upload_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5410,7 +5410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5869,7 +5869,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6328,7 +6328,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6787,7 +6787,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7246,7 +7246,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7705,7 +7705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9452,8 +9452,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_flutter.json b/recipes/engine/engine.expected/win_upload_font_subset_flutter.json
index c8c8a16..d14ae4d 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5921,7 +5921,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6380,7 +6380,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6839,7 +6839,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7298,7 +7298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8216,7 +8216,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9963,8 +9963,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_prod.json b/recipes/engine/engine.expected/win_upload_font_subset_prod.json
index aa046cf..6d7357c 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6337,7 +6337,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6796,7 +6796,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7255,7 +7255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7714,7 +7714,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8173,7 +8173,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8632,7 +8632,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -10379,8 +10379,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_staging.json b/recipes/engine/engine.expected/win_upload_font_subset_staging.json
index 16d557c..ca4ba49 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5921,7 +5921,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6380,7 +6380,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6839,7 +6839,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7298,7 +7298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8216,7 +8216,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9963,8 +9963,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_flutter.json b/recipes/engine/engine.expected/win_upload_no_lto_flutter.json
index 1e14b7c..4722622 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5416,7 +5416,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5875,7 +5875,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6334,7 +6334,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6793,7 +6793,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7252,7 +7252,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7711,7 +7711,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9458,8 +9458,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter.json
index 6f2aa83..2598b17 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5927,7 +5927,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6386,7 +6386,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6845,7 +6845,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7304,7 +7304,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7763,7 +7763,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8222,7 +8222,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9969,8 +9969,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod.json
index 67c71cb..bfeccfc 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6343,7 +6343,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6802,7 +6802,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7261,7 +7261,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7720,7 +7720,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8179,7 +8179,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8638,7 +8638,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -10385,8 +10385,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging.json
index f4bfea2..10747a2 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5927,7 +5927,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6386,7 +6386,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6845,7 +6845,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7304,7 +7304,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7763,7 +7763,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8222,7 +8222,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9969,8 +9969,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_prod.json b/recipes/engine/engine.expected/win_upload_no_lto_prod.json
index f84e2d0..6ee21ad 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_prod.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5832,7 +5832,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6291,7 +6291,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6750,7 +6750,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7209,7 +7209,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7668,7 +7668,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8127,7 +8127,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9874,8 +9874,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_staging.json b/recipes/engine/engine.expected/win_upload_no_lto_staging.json
index b07a245..343ab48 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_staging.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5416,7 +5416,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5875,7 +5875,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6334,7 +6334,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6793,7 +6793,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7252,7 +7252,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7711,7 +7711,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9458,8 +9458,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_prod.json b/recipes/engine/engine.expected/win_upload_prod.json
index eb49814..c3f2950 100644
--- a/recipes/engine/engine.expected/win_upload_prod.json
+++ b/recipes/engine/engine.expected/win_upload_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5826,7 +5826,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6285,7 +6285,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6744,7 +6744,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7203,7 +7203,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7662,7 +7662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8121,7 +8121,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9868,8 +9868,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_flutter.json b/recipes/engine/engine.expected/win_upload_publish_cipd_flutter.json
index 281807a..0bdec7f 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5410,7 +5410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5869,7 +5869,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6328,7 +6328,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6787,7 +6787,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7246,7 +7246,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7705,7 +7705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9452,8 +9452,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_flutter.json b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_flutter.json
index c8c8a16..d14ae4d 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5921,7 +5921,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6380,7 +6380,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6839,7 +6839,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7298,7 +7298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8216,7 +8216,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9963,8 +9963,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_prod.json b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_prod.json
index aa046cf..6d7357c 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6337,7 +6337,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6796,7 +6796,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7255,7 +7255,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7714,7 +7714,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8173,7 +8173,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8632,7 +8632,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -10379,8 +10379,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_staging.json b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_staging.json
index 16d557c..ca4ba49 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5921,7 +5921,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6380,7 +6380,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6839,7 +6839,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7298,7 +7298,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7757,7 +7757,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8216,7 +8216,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9963,8 +9963,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_flutter.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_flutter.json
index 1e14b7c..4722622 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5416,7 +5416,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5875,7 +5875,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6334,7 +6334,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6793,7 +6793,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7252,7 +7252,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7711,7 +7711,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9458,8 +9458,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_flutter.json
index 6f2aa83..2598b17 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_flutter.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5927,7 +5927,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6386,7 +6386,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6845,7 +6845,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7304,7 +7304,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7763,7 +7763,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8222,7 +8222,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9969,8 +9969,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_prod.json
index 67c71cb..bfeccfc 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6343,7 +6343,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6802,7 +6802,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7261,7 +7261,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7720,7 +7720,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8179,7 +8179,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8638,7 +8638,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -10385,8 +10385,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_staging.json
index f4bfea2..10747a2 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2521,7 +2521,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3028,7 +3028,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3540,7 +3540,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -4049,7 +4049,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5927,7 +5927,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6386,7 +6386,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6845,7 +6845,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7304,7 +7304,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7763,7 +7763,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8222,7 +8222,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9969,8 +9969,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_prod.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_prod.json
index f84e2d0..6ee21ad 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_prod.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5832,7 +5832,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6291,7 +6291,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6750,7 +6750,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7209,7 +7209,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7668,7 +7668,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8127,7 +8127,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9874,8 +9874,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_staging.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_staging.json
index b07a245..343ab48 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_staging.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5416,7 +5416,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5875,7 +5875,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6334,7 +6334,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6793,7 +6793,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7252,7 +7252,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7711,7 +7711,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9458,8 +9458,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_prod.json b/recipes/engine/engine.expected/win_upload_publish_cipd_prod.json
index eb49814..c3f2950 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_prod.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_prod.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5826,7 +5826,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6285,7 +6285,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6744,7 +6744,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7203,7 +7203,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7662,7 +7662,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -8121,7 +8121,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9868,8 +9868,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_staging.json b/recipes/engine/engine.expected/win_upload_publish_cipd_staging.json
index 9f35dc2..78c5939 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_staging.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5410,7 +5410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5869,7 +5869,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6328,7 +6328,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6787,7 +6787,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7246,7 +7246,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7705,7 +7705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9452,8 +9452,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.expected/win_upload_staging.json b/recipes/engine/engine.expected/win_upload_staging.json
index 9f35dc2..78c5939 100644
--- a/recipes/engine/engine.expected/win_upload_staging.json
+++ b/recipes/engine/engine.expected/win_upload_staging.json
@@ -811,7 +811,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -1555,7 +1555,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2061,7 +2061,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -2569,7 +2569,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3081,7 +3081,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -3590,7 +3590,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5410,7 +5410,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -5869,7 +5869,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6328,7 +6328,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -6787,7 +6787,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7246,7 +7246,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -7705,7 +7705,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]\\ninja.exe",
+      "[CACHE]\\builder\\src\\flutter\\third_party\\ninja\\ninja",
       "-j",
       "1024",
       "-C",
@@ -9452,8 +9452,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\lib\\gcloud.py",
+      "[START_DIR]\\cipd_tool\\path\\to\\gcloud\\version%3Apinned-version\\bin\\gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine.py b/recipes/engine/engine.py
index 3af9576..d9c160f 100644
--- a/recipes/engine/engine.py
+++ b/recipes/engine/engine.py
@@ -132,7 +132,8 @@
   checkout = GetCheckoutPath(api)
   build_dir = checkout.join('out/%s' % config)
   goma_jobs = api.properties['goma_jobs']
-  ninja_args = [api.depot_tools.ninja_path, '-j', goma_jobs, '-C', build_dir]
+  ninja_path = checkout.join('flutter', 'third_party', 'ninja', 'ninja')
+  ninja_args = [ninja_path, '-j', goma_jobs, '-C', build_dir]
   ninja_args.extend(targets)
   with api.goma.build_with_goma(), api.depot_tools.on_path():
     name = 'build %s' % ' '.join([config] + list(targets))
diff --git a/recipes/engine/engine_arm.expected/clobber.json b/recipes/engine/engine_arm.expected/clobber.json
index 1d74574..ec896aa 100644
--- a/recipes/engine/engine_arm.expected/clobber.json
+++ b/recipes/engine/engine_arm.expected/clobber.json
@@ -693,7 +693,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1291,7 +1291,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1720,7 +1720,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -2747,8 +2747,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine_arm.expected/experimental.json b/recipes/engine/engine_arm.expected/experimental.json
index 7cab357..a8efd6c 100644
--- a/recipes/engine/engine_arm.expected/experimental.json
+++ b/recipes/engine/engine_arm.expected/experimental.json
@@ -581,7 +581,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1179,7 +1179,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1608,7 +1608,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2635,8 +2635,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine_arm.expected/experimental_upload.json b/recipes/engine/engine_arm.expected/experimental_upload.json
index 8797af5..d7136ec 100644
--- a/recipes/engine/engine_arm.expected/experimental_upload.json
+++ b/recipes/engine/engine_arm.expected/experimental_upload.json
@@ -581,7 +581,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1179,7 +1179,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1608,7 +1608,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2943,8 +2943,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json b/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
index 0c318cf..c9ca763 100644
--- a/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine/engine_arm.expected/gcloud_pubsub_failure.json
@@ -583,7 +583,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1181,7 +1181,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1610,7 +1610,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -2637,8 +2637,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine_arm.expected/linux.json b/recipes/engine/engine_arm.expected/linux.json
index 4f049af..566eab1 100644
--- a/recipes/engine/engine_arm.expected/linux.json
+++ b/recipes/engine/engine_arm.expected/linux.json
@@ -581,7 +581,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1179,7 +1179,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1608,7 +1608,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2635,8 +2635,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine_arm.expected/linux_upload.json b/recipes/engine/engine_arm.expected/linux_upload.json
index 5218167..fe5999a 100644
--- a/recipes/engine/engine_arm.expected/linux_upload.json
+++ b/recipes/engine/engine_arm.expected/linux_upload.json
@@ -581,7 +581,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1179,7 +1179,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1608,7 +1608,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -2943,8 +2943,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine_arm.expected/pull_request.json b/recipes/engine/engine_arm.expected/pull_request.json
index 5ae0001..f5003c9 100644
--- a/recipes/engine/engine_arm.expected/pull_request.json
+++ b/recipes/engine/engine_arm.expected/pull_request.json
@@ -583,7 +583,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1181,7 +1181,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -1610,7 +1610,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "200",
       "-C",
@@ -2637,8 +2637,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "pubsub",
       "topics",
       "publish",
diff --git a/recipes/engine/engine_arm.py b/recipes/engine/engine_arm.py
index d4d64d8..9bf9e3b 100644
--- a/recipes/engine/engine_arm.py
+++ b/recipes/engine/engine_arm.py
@@ -72,7 +72,8 @@
   checkout = GetCheckoutPath(api)
   build_dir = checkout.join('out/%s' % config)
   goma_jobs = api.properties['goma_jobs']
-  ninja_args = [api.depot_tools.ninja_path, '-j', goma_jobs, '-C', build_dir]
+  ninja_path = checkout.join('flutter', 'third_party', 'ninja', 'ninja')
+  ninja_args = [ninja_path, '-j', goma_jobs, '-C', build_dir]
   ninja_args.extend(targets)
   with api.goma.build_with_goma(), api.depot_tools.on_path():
     name = 'build %s' % ' '.join([config] + list(targets))
diff --git a/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json b/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json
index 5b33b04..27a4ffc 100644
--- a/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json
@@ -245,7 +245,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/autoninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-C",
       "[CACHE]/builder/src/out/android_debug_unopt"
     ],
@@ -564,7 +564,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/autoninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-C",
       "[CACHE]/builder/src/out/host_debug_unopt"
     ],
diff --git a/recipes/engine/engine_builder.py b/recipes/engine/engine_builder.py
index ae5c7ee..2d8a383 100644
--- a/recipes/engine/engine_builder.py
+++ b/recipes/engine/engine_builder.py
@@ -32,15 +32,16 @@
 def Build(api, config, disable_goma, *targets):
   checkout = api.path['cache'].join('builder', 'src')
   build_dir = checkout.join('out/%s' % config)
+  ninja_path = checkout.join('flutter', 'third_party', 'ninja', 'ninja')
 
   if not disable_goma:
-    ninja_args = [api.depot_tools.autoninja_path, '-C', build_dir]
+    ninja_args = [ninja_path, '-C', build_dir]
     ninja_args.extend(targets)
     with api.goma.build_with_goma():
       name='build %s' % ' '.join([config] + list(targets))
       api.step(name, ninja_args)
   else:
-    ninja_args = [api.depot_tools.autoninja_path, '-C', build_dir]
+    ninja_args = [ninja_path, '-C', build_dir]
     ninja_args.extend(targets)
     api.step('build %s' % ' '.join([config] + list(targets)), ninja_args)
 
diff --git a/recipes/engine/femu_test.expected/arm64_emulator_arch.json b/recipes/engine/femu_test.expected/arm64_emulator_arch.json
index 80afb03..beb4389 100644
--- a/recipes/engine/femu_test.expected/arm64_emulator_arch.json
+++ b/recipes/engine/femu_test.expected/arm64_emulator_arch.json
@@ -452,7 +452,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -730,7 +730,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1273,9 +1273,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1681,9 +1678,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1862,9 +1856,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2003,9 +1994,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2144,9 +2132,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2285,9 +2270,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/engine/femu_test.expected/dangerous_test_commands.json b/recipes/engine/femu_test.expected/dangerous_test_commands.json
index 03c7fb0..51885ea 100644
--- a/recipes/engine/femu_test.expected/dangerous_test_commands.json
+++ b/recipes/engine/femu_test.expected/dangerous_test_commands.json
@@ -452,7 +452,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -730,7 +730,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1273,9 +1273,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1681,9 +1678,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1862,9 +1856,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2003,9 +1994,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2144,9 +2132,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2285,9 +2270,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/engine/femu_test.expected/femu_with_package_list.json b/recipes/engine/femu_test.expected/femu_with_package_list.json
index 3c0ad37..8372875 100644
--- a/recipes/engine/femu_test.expected/femu_with_package_list.json
+++ b/recipes/engine/femu_test.expected/femu_with_package_list.json
@@ -452,7 +452,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -730,7 +730,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1273,9 +1273,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1681,9 +1678,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1862,9 +1856,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2003,9 +1994,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2144,9 +2132,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2285,9 +2270,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/engine/femu_test.expected/invalid_emulator_arch.json b/recipes/engine/femu_test.expected/invalid_emulator_arch.json
index 733e539..27696e8 100644
--- a/recipes/engine/femu_test.expected/invalid_emulator_arch.json
+++ b/recipes/engine/femu_test.expected/invalid_emulator_arch.json
@@ -452,7 +452,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -730,7 +730,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1273,9 +1273,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1681,9 +1678,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1862,9 +1856,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2003,9 +1994,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2144,9 +2132,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2285,9 +2270,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/engine/femu_test.expected/multiple_non_root_fars.json b/recipes/engine/femu_test.expected/multiple_non_root_fars.json
index cbc7f4b..99e94dd 100644
--- a/recipes/engine/femu_test.expected/multiple_non_root_fars.json
+++ b/recipes/engine/femu_test.expected/multiple_non_root_fars.json
@@ -452,7 +452,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -730,7 +730,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1273,9 +1273,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1681,9 +1678,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1862,9 +1856,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2003,9 +1994,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2144,9 +2132,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2285,9 +2270,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/engine/femu_test.expected/no_zircon_file.json b/recipes/engine/femu_test.expected/no_zircon_file.json
index 0e49534..367cb58 100644
--- a/recipes/engine/femu_test.expected/no_zircon_file.json
+++ b/recipes/engine/femu_test.expected/no_zircon_file.json
@@ -452,7 +452,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -730,7 +730,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1273,9 +1273,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1681,9 +1678,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/engine/femu_test.expected/run_on_test_specified_arch.json b/recipes/engine/femu_test.expected/run_on_test_specified_arch.json
index c9c620e..7957202 100644
--- a/recipes/engine/femu_test.expected/run_on_test_specified_arch.json
+++ b/recipes/engine/femu_test.expected/run_on_test_specified_arch.json
@@ -452,7 +452,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -730,7 +730,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1273,9 +1273,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1681,9 +1678,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1862,9 +1856,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2003,9 +1994,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2144,9 +2132,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2285,9 +2270,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json b/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json
index da12508..c58c198 100644
--- a/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json
+++ b/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json
@@ -452,7 +452,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -730,7 +730,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1273,9 +1273,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1681,9 +1678,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1862,9 +1856,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2003,9 +1994,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2144,9 +2132,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2285,9 +2270,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/engine/femu_test.expected/start_femu.json b/recipes/engine/femu_test.expected/start_femu.json
index 6b35c39..bdd01e2 100644
--- a/recipes/engine/femu_test.expected/start_femu.json
+++ b/recipes/engine/femu_test.expected/start_femu.json
@@ -452,7 +452,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -730,7 +730,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
@@ -1273,9 +1273,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1681,9 +1678,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -1862,9 +1856,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2003,9 +1994,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2144,9 +2132,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
@@ -2285,9 +2270,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/engine/femu_test.py b/recipes/engine/femu_test.py
index a22fa59..843250b 100644
--- a/recipes/engine/femu_test.py
+++ b/recipes/engine/femu_test.py
@@ -56,7 +56,8 @@
   checkout = GetCheckoutPath(api)
   build_dir = checkout.join('out/%s' % config)
   goma_jobs = api.properties['goma_jobs']
-  ninja_args = [api.depot_tools.ninja_path, '-j', goma_jobs, '-C', build_dir]
+  ninja_path = checkout.join('flutter', 'third_party', 'ninja', 'ninja')
+  ninja_args = [ninja_path, '-j', goma_jobs, '-C', build_dir]
   ninja_args.extend(targets)
   with api.goma.build_with_goma():
     name = 'build %s' % ' '.join([config] + list(targets))
diff --git a/recipes/engine/scenarios.expected/without_failure_upload.json b/recipes/engine/scenarios.expected/without_failure_upload.json
index 2ba489a..d1d6f47 100644
--- a/recipes/engine/scenarios.expected/without_failure_upload.json
+++ b/recipes/engine/scenarios.expected/without_failure_upload.json
@@ -891,7 +891,7 @@
   },
   {
     "cmd": [
-      "RECIPE_REPO[depot_tools]/ninja",
+      "[CACHE]/builder/src/flutter/third_party/ninja/ninja",
       "-j",
       "1024",
       "-C",
diff --git a/recipes/engine/scenarios.py b/recipes/engine/scenarios.py
index f134bb2..0a6c86d 100644
--- a/recipes/engine/scenarios.py
+++ b/recipes/engine/scenarios.py
@@ -36,7 +36,8 @@
   checkout = GetCheckoutPath(api)
   build_dir = checkout.join('out', config)
   goma_jobs = api.properties['goma_jobs']
-  ninja_args = [api.depot_tools.ninja_path, '-j', goma_jobs, '-C', build_dir]
+  ninja_path = checkout.join('flutter', 'third_party', 'ninja', 'ninja')
+  ninja_args = [ninja_path, '-j', goma_jobs, '-C', build_dir]
   ninja_args.extend(targets)
   with api.goma.build_with_goma():
     name = 'build %s' % ' '.join([config] + list(targets))
diff --git a/recipes/firebaselab/firebaselab.expected/basic.json b/recipes/firebaselab/firebaselab.expected/basic.json
index 2578cae..17f1be9 100644
--- a/recipes/firebaselab/firebaselab.expected/basic.json
+++ b/recipes/firebaselab/firebaselab.expected/basic.json
@@ -321,8 +321,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "--quiet",
       "config",
       "set",
@@ -386,8 +385,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "firebase",
       "test",
       "android",
@@ -462,8 +460,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "firebase",
       "test",
       "android",
@@ -654,9 +651,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/firebaselab/firebaselab.expected/failure 10.json b/recipes/firebaselab/firebaselab.expected/failure 10.json
index 253d5bb..b6cb2a0 100644
--- a/recipes/firebaselab/firebaselab.expected/failure 10.json
+++ b/recipes/firebaselab/firebaselab.expected/failure 10.json
@@ -321,8 +321,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "--quiet",
       "config",
       "set",
@@ -386,8 +385,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "firebase",
       "test",
       "android",
@@ -431,8 +429,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "firebase",
       "test",
       "android",
@@ -507,8 +504,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "firebase",
       "test",
       "android",
@@ -699,9 +695,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
diff --git a/recipes/firebaselab/firebaselab.expected/failure 15.json b/recipes/firebaselab/firebaselab.expected/failure 15.json
index 253d5bb..b6cb2a0 100644
--- a/recipes/firebaselab/firebaselab.expected/failure 15.json
+++ b/recipes/firebaselab/firebaselab.expected/failure 15.json
@@ -321,8 +321,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "--quiet",
       "config",
       "set",
@@ -386,8 +385,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "firebase",
       "test",
       "android",
@@ -431,8 +429,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "firebase",
       "test",
       "android",
@@ -507,8 +504,7 @@
   },
   {
     "cmd": [
-      "python",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
       "firebase",
       "test",
       "android",
@@ -699,9 +695,6 @@
   },
   {
     "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
       "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",