Revert "build: roll infra_paths changes"

scripts/slave/recipes/mojo.expected/mojo_win_dbg.json

Index: scripts/slave/recipes/mojo.expected/mojo_win_dbg.json
diff --git a/scripts/slave/recipes/mojo.expected/mojo_win_dbg.json b/scripts/slave/recipes/mojo.expected/mojo_win_dbg.json
index 418349345b18dcf9c3ce7557197a0738ad1793ac..aaa6cdc908c0eff3f6b64a97cef1c43ecce199cc 100644
--- a/scripts/slave/recipes/mojo.expected/mojo_win_dbg.json
+++ b/scripts/slave/recipes/mojo.expected/mojo_win_dbg.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/mojo.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/mojo.git'}]",
       "--root",
       "src",
       "--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,31 +64,33 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/mojo/tools/mojob.py",
+      "[SLAVE_BUILD]/src/mojo/tools/mojob.py",
       "gn",
       "--debug"
     ],
-    "cwd": "[CWD]/src",
+    "cwd": "[SLAVE_BUILD]/src",
     "name": "mojob gn"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/mojo/tools/mojob.py",
+      "[SLAVE_BUILD]/src/mojo/tools/mojob.py",
       "build",
       "--debug"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "mojob build"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/src/mojo/tools/get_test_list.py",
+      "[SLAVE_BUILD]/src/mojo/tools/get_test_list.py",
       "{\"build_number\": 571, \"builder_name\": \"Mojo Win (dbg)\", \"dcheck_always_on\": false, \"is_debug\": true, \"master_name\": \"chromium.testing.master\", \"target_os\": \"windows\", \"test_results_server\": \"test-results.appspot.com\", \"test_types\": [\"default\"]}",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "get_test_list",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@[@@@",
@@ -104,7 +108,7 @@
     "cmd": [
       "world"
     ],
-    "cwd": "[CWD]/src",
+    "cwd": "[SLAVE_BUILD]/src",
     "name": "Hello"
   },
   {