Revert "build: roll infra_paths changes"

scripts/slave/recipes/v8/node_integration.expected/full_client_v8_fyi_V8___node_js_integration___lkgr.json

Index: scripts/slave/recipes/v8/node_integration.expected/full_client_v8_fyi_V8___node_js_integration___lkgr.json
diff --git a/scripts/slave/recipes/v8/node_integration.expected/full_client_v8_fyi_V8___node_js_integration___lkgr.json b/scripts/slave/recipes/v8/node_integration.expected/full_client_v8_fyi_V8___node_js_integration___lkgr.json
index 56e1929bcfe26d6d9ad59d757f9c5770e6510722..36033a9f62294e0bee5c9e9f1832df06bbc8aefa 100644
--- a/scripts/slave/recipes/v8/node_integration.expected/full_client_v8_fyi_V8___node_js_integration___lkgr.json
+++ b/scripts/slave/recipes/v8/node_integration.expected/full_client_v8_fyi_V8___node_js_integration___lkgr.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'node.js', 'url': 'https://chromium.googlesource.com/external/github.com/v8/node'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'node.js', 'url': 'https://chromium.googlesource.com/external/github.com/v8/node'}]",
       "--root",
       "v8",
       "--revision_mapping_file",
       "{\"node.js\": \"got_node_js_revision\", \"v8\": \"got_revision\"}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -27,6 +27,7 @@
       "--no_shallow",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -76,13 +77,14 @@
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
     "cmd": [
-      "[CWD]/node.js/configure"
+      "[SLAVE_BUILD]/node.js/configure"
     ],
-    "cwd": "[CWD]/node.js",
+    "cwd": "[SLAVE_BUILD]/node.js",
     "name": "configure node.js - baseline"
   },
   {
@@ -91,7 +93,7 @@
       "-j8",
       "test"
     ],
-    "cwd": "[CWD]/node.js",
+    "cwd": "[SLAVE_BUILD]/node.js",
     "name": "build and test node.js - baseline"
   },
   {
@@ -99,8 +101,9 @@
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
-      "[CWD]/node.js/deps/v8"
+      "[SLAVE_BUILD]/node.js/deps/v8"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree v8",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ -118,20 +121,21 @@
       "python",
       "-u",
       "RECIPE_MODULE[build::v8]/resources/copy_v8.py",
-      "[CWD]/v8",
-      "[CWD]/node.js/deps/v8",
+      "[SLAVE_BUILD]/v8",
+      "[SLAVE_BUILD]/node.js/deps/v8",
       ".git",
-      "[CWD]/v8/buildtools",
-      "[CWD]/v8/out",
-      "[CWD]/v8/third_party"
+      "[SLAVE_BUILD]/v8/buildtools",
+      "[SLAVE_BUILD]/v8/out",
+      "[SLAVE_BUILD]/v8/third_party"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "copy v8 tree"
   },
   {
     "cmd": [
-      "[CWD]/node.js/configure"
+      "[SLAVE_BUILD]/node.js/configure"
     ],
-    "cwd": "[CWD]/node.js",
+    "cwd": "[SLAVE_BUILD]/node.js",
     "name": "configure node.js"
   },
   {
@@ -140,7 +144,7 @@
       "-j8",
       "test"
     ],
-    "cwd": "[CWD]/node.js",
+    "cwd": "[SLAVE_BUILD]/node.js",
     "name": "build and test node.js"
   },
   {