Revert "build: roll infra_paths changes"

scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-drt-be.json

Index: scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-drt-be.json
diff --git a/scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-drt-be.json b/scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-drt-be.json
index 747a688b2cc5d403f998408fb80b7d80c8dd7351..8eae85b2c8eb7406cfce099cfdb3816e5d9aff66 100644
--- a/scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-drt-be.json
+++ b/scripts/slave/recipes/dart/dart2js.expected/dart2js-linux-drt-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,22 +64,22 @@
     "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"
   },
   {
@@ -105,7 +107,7 @@
       "--shards=105",
       "--shard=93"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "none drt try tests"
   },
   {
@@ -134,7 +136,7 @@
       "--shard=93",
       "--append_logs"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "dart2js drt tests"
   },
   {
@@ -165,7 +167,7 @@
       "dart2js_extra",
       "dart2js_native"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "dart2js drt extra tests"
   },
   {
@@ -195,7 +197,7 @@
       "--append_logs",
       "try"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "dart2js drt try tests"
   },
   {
@@ -225,7 +227,7 @@
       "--checked",
       "--append_logs"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "dart2js drt checked tests"
   },
   {
@@ -257,7 +259,7 @@
       "dart2js_extra",
       "dart2js_native"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "dart2js drt extra checked tests"
   },
   {
@@ -288,17 +290,17 @@
       "--append_logs",
       "try"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "dart2js drt try checked 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"
   },
   {
@@ -306,7 +308,7 @@
       "cat",
       ".debug.log"
     ],
-    "cwd": "[CWD]/sdk",
+    "cwd": "[SLAVE_BUILD]/sdk",
     "name": "debug log"
   },
   {