Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___gc_stress.json
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___gc_stress.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___gc_stress.json
index f069da39736df93f8dcba38414fae1e4665f1797..63acf98cf7310330b0fae20fd7a4fb72be436127 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___gc_stress.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___gc_stress.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",
@@ -171,6 +173,7 @@
       "--json-test-results",
       "${ISOLATED_OUTDIR}/output.json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] Mjsunit on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -203,7 +206,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
@@ -278,6 +281,7 @@
       "--json-test-results",
       "${ISOLATED_OUTDIR}/output.json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] Webkit on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -298,7 +302,7 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/swarming.client/swarming.py",
+      "[SLAVE_BUILD]/swarming.client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
@@ -374,6 +378,7 @@
       "--json-test-results",
       "${ISOLATED_OUTDIR}/output.json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "[trigger] Mjsunit - ignition - turbofan on Ubuntu-12.04",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -403,9 +408,9 @@
       "-u",
       "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
       "--swarming-client-dir",
-      "[CWD]/swarming.client",
+      "[SLAVE_BUILD]/swarming.client",
       "--temp-root-dir",
-      "[TMP]",
+      "[TMP_BASE]",
       "--merged-test-output",
       "/path/to/tmp/json",
       "--",
@@ -418,6 +423,7 @@
       "3",
       "Mjsunit/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Mjsunit",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
@@ -443,9 +449,9 @@
       "-u",
       "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
       "--swarming-client-dir",
-      "[CWD]/swarming.client",
+      "[SLAVE_BUILD]/swarming.client",
       "--temp-root-dir",
-      "[TMP]",
+      "[TMP_BASE]",
       "--merged-test-output",
       "/path/to/tmp/json",
       "--",
@@ -458,6 +464,7 @@
       "1",
       "Webkit/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Webkit",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
@@ -483,9 +490,9 @@
       "-u",
       "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
       "--swarming-client-dir",
-      "[CWD]/swarming.client",
+      "[SLAVE_BUILD]/swarming.client",
       "--temp-root-dir",
-      "[TMP]",
+      "[TMP_BASE]",
       "--merged-test-output",
       "/path/to/tmp/json",
       "--",
@@ -498,6 +505,7 @@
       "2",
       "Mjsunit - ignition - turbofan/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Mjsunit - ignition - turbofan",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",