build: roll infra_paths changes

scripts/slave/recipes/infra/try_recipe.expected/default.json

Index: scripts/slave/recipes/infra/try_recipe.expected/default.json
diff --git a/scripts/slave/recipes/infra/try_recipe.expected/default.json b/scripts/slave/recipes/infra/try_recipe.expected/default.json
index 6d06a6bef6a73a7471ce21acdb949679325f7dcc..9f7c7f5b742ff13ab2a13ad0fa1560007c49ee8e 100644
--- a/scripts/slave/recipes/infra/try_recipe.expected/default.json
+++ b/scripts/slave/recipes/infra/try_recipe.expected/default.json
@@ -11,13 +11,13 @@
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
+      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://chromium.googlesource.com/chromium/tools/build.git'}]",
       "--root",
       "build",
       "--revision_mapping_file",
       "{\"build\": \"got_revision\"}",
       "--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]"
     },
@@ -67,15 +66,13 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/build/scripts/slave/recipes.py",
+      "[CWD]/build/scripts/slave/recipes.py",
       "fetch"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "fetch recipe engine deps"
   },
   {
     "cmd": [],
-    "cwd": "[SLAVE_BUILD]",
     "name": "properties (0)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@properties@{@@@",
@@ -95,18 +92,17 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/build/scripts/tools/annotee_indenter.py",
+      "[CWD]/build/scripts/tools/annotee_indenter.py",
       "--base-level",
       "1",
       "--use-python-executable",
       "--",
-      "[SLAVE_BUILD]/build/scripts/slave/recipes.py",
+      "[CWD]/build/scripts/slave/recipes.py",
       "run",
       "--properties-file",
       "{\"buildername\": \"recipe_try\", \"buildnumber\": 571, \"mastername\": \"tryserver.infra\", \"prop1\": \"value1\", \"prop2\": \"value2\", \"slavename\": \"TestSlavename\", \"try_level\": 1}",
       "infra/build_repo_real_try"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "infra.build_repo_real_try run"
   },
   {