Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Fuzzer_fuzz_archive.json
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Fuzzer_fuzz_archive.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Fuzzer_fuzz_archive.json
index 82418b3850423419796eed31cc8c8ed5620edde0..98579828efb11bd6b5238f81d55e27cb0eb02dd6 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Fuzzer_fuzz_archive.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Fuzzer_fuzz_archive.json
@@ -5,10 +5,11 @@
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
-      "[CWD]/swarming.client",
+      "[SLAVE_BUILD]/swarming.client",
       "--url",
       "https://chromium.googlesource.com/external/swarming.client.git"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "git setup (swarming_client)"
   },
   {
@@ -19,7 +20,7 @@
       "origin",
       "[dummy swarming client hash]"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "git fetch (swarming_client)"
   },
   {
@@ -29,7 +30,7 @@
       "-f",
       "FETCH_HEAD"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "git checkout (swarming_client)"
   },
   {
@@ -38,7 +39,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -53,7 +54,7 @@
       "-d",
       "-x"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "git clean (swarming_client)"
   },
   {
@@ -62,7 +63,7 @@
       "submodule",
       "sync"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "submodule sync (swarming_client)"
   },
   {
@@ -73,7 +74,7 @@
       "--init",
       "--recursive"
     ],
-    "cwd": "[CWD]/swarming.client",
+    "cwd": "[SLAVE_BUILD]/swarming.client",
     "name": "submodule update (swarming_client)",
     "~followup_annotations": [
       "@@@SET_BUILD_PROPERTY@got_revision@\"20123\"@@@"
@@ -83,9 +84,10 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "--version"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "swarming.py --version",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -96,7 +98,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
@@ -156,6 +158,7 @@
       "out/Debug/d8",
       "${ISOLATED_OUTDIR}/fuzz-results-54321.tar.bz2"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] Fuzz on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -176,7 +179,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
@@ -188,8 +191,9 @@
       "--task-summary-json",
       "/path/to/tmp/json",
       "--task-output-dir",
-      "[TMP]/swarming_output_tmp_1"
+      "[TMP_BASE]/swarming_output_tmp_1"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Fuzz on Ubuntu-12.04",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
@@ -204,12 +208,13 @@
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
-      "[ROOT]/b/depot_tools/gsutil.py",
+      "[DEPOT_TOOLS]/gsutil.py",
       "----",
       "cp",
-      "[TMP]/swarming_output_tmp_1/0/fuzz-results-54321.tar.bz2",
+      "[TMP_BASE]/swarming_output_tmp_1/0/fuzz-results-54321.tar.bz2",
       "gs://chromium-v8/fuzzer-archives/fuzz-results-54321.tar.bz2"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-v8/fuzzer-archives/fuzz-results-54321.tar.bz2@@@"