build: roll infra_paths changes

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

Index: scripts/slave/recipes/mojo.expected/mojo_linux_try.json
diff --git a/scripts/slave/recipes/mojo.expected/mojo_linux_try.json b/scripts/slave/recipes/mojo.expected/mojo_linux_try.json
index 6d0298840835540c0812cae00182aeac98ad5122..7d7034efc98afa9010fa032f6b9e91973056e70d 100644
--- a/scripts/slave/recipes/mojo.expected/mojo_linux_try.json
+++ b/scripts/slave/recipes/mojo.expected/mojo_linux_try.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/mojo.git'}]",
+      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/mojo.git'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
-      "[GIT_CACHE]",
+      "[ROOT]/b/build/slave/cache_dir",
       "--issue",
       "12853011",
       "--patchset",
@@ -31,7 +31,6 @@
       "--force",
       "--output_manifest"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -60,7 +59,6 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -70,14 +68,14 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/mojo/tools/mojob.py",
+      "[CWD]/src/mojo/tools/mojob.py",
       "gn",
       "--release",
       "--dcheck_always_on"
     ],
-    "cwd": "[SLAVE_BUILD]/src",
+    "cwd": "[CWD]/src",
     "env": {
-      "GOMA_DIR": "[BUILD]/goma"
+      "GOMA_DIR": "[ROOT]/b/build/goma"
     },
     "name": "mojob gn"
   },
@@ -85,14 +83,13 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/mojo/tools/mojob.py",
+      "[CWD]/src/mojo/tools/mojob.py",
       "build",
       "--release",
       "--dcheck_always_on"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
-      "GOMA_DIR": "[BUILD]/goma"
+      "GOMA_DIR": "[ROOT]/b/build/goma"
     },
     "name": "mojob build"
   },
@@ -100,11 +97,10 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/mojo/tools/get_test_list.py",
+      "[CWD]/src/mojo/tools/get_test_list.py",
       "{\"build_number\": 571, \"builder_name\": \"Mojo Linux Try\", \"dcheck_always_on\": true, \"is_debug\": false, \"master_name\": \"chromium.testing.master\", \"target_os\": \"linux\", \"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@[@@@",
@@ -122,7 +118,7 @@
     "cmd": [
       "world"
     ],
-    "cwd": "[SLAVE_BUILD]/src",
+    "cwd": "[CWD]/src",
     "name": "Hello"
   },
   {