Revert "build: roll infra_paths changes"

scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-jsshell-hostchecked-csp-3-5-be.json

Index: scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-jsshell-hostchecked-csp-3-5-be.json
diff --git a/scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-jsshell-hostchecked-csp-3-5-be.json b/scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-jsshell-hostchecked-csp-3-5-be.json
index 1335eddc0e946f8a49caf3cbf33d6d268d5334bd..b511e9c2dc401044476c10b2dab74bfbd32dbf3a 100644
--- a/scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-jsshell-hostchecked-csp-3-5-be.json
+++ b/scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-jsshell-hostchecked-csp-3-5-be.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'sdk', 'url': 'https://chromium.googlesource.com/external/github.com/dart-lang/sdk.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'sdk', 'url': 'https://chromium.googlesource.com/external/github.com/dart-lang/sdk.git'}]",
       "--root",
       "sdk",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,6 +25,7 @@
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -53,6 +54,7 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -62,29 +64,29 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/sdk/tools/task_kill.py",
+      "[SLAVE_BUILD]/sdk/tools/task_kill.py",
       "--kill_browsers=True"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "taskkill before building"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/sdk/tools/build.py",
+      "[SLAVE_BUILD]/sdk/tools/build.py",
       "-mrelease",
       "--arch=ia32",
       "dart2js_bot"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "build dart"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/sdk/tools/test.py",
+      "[SLAVE_BUILD]/sdk/tools/test.py",
       "--mode=release",
       "--compiler=none",
       "--runtime=vm",
@@ -103,14 +105,14 @@
       "dart2js",
       "try"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "dart2js unit tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/sdk/tools/test.py",
+      "[SLAVE_BUILD]/sdk/tools/test.py",
       "--mode=release",
       "--arch=ia32",
       "--compiler=dart2js",
@@ -131,14 +133,14 @@
       "--shard=3",
       "--append_logs"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "dart2js jsshell tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/sdk/tools/test.py",
+      "[SLAVE_BUILD]/sdk/tools/test.py",
       "--mode=release",
       "--arch=ia32",
       "--compiler=dart2js",
@@ -161,14 +163,14 @@
       "dart2js_extra",
       "dart2js_native"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "dart2js jsshell extra tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/sdk/tools/test.py",
+      "[SLAVE_BUILD]/sdk/tools/test.py",
       "--mode=release",
       "--arch=ia32",
       "--compiler=dart2js",
@@ -190,17 +192,17 @@
       "--append_logs",
       "try"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "dart2js jsshell try tests"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/sdk/tools/task_kill.py",
+      "[SLAVE_BUILD]/sdk/tools/task_kill.py",
       "--kill_browsers=True"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "taskkill after testing"
   },
   {
@@ -208,7 +210,7 @@
       "cat",
       ".debug.log"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "debug log"
   },
   {