build: roll infra_paths changes

scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner.json

Index: scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner.json
diff --git a/scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner.json b/scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner.json
index c59804a096580918f481303dec38c3fabd0baf5e..bce604bc7bb1047bc122972d04a04396e1ff763a 100644
--- a/scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner.json
+++ b/scripts/slave/recipes/infra/build_repo_real_try.expected/ok-inner.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",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -25,7 +25,6 @@
       "--force",
       "--output_manifest"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -63,11 +62,10 @@
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
-      "[BUILD]/clone",
+      "[ROOT]/b/build/clone",
       "--url",
       "https://chromium.googlesource.com/chromium/tools/build"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "git setup"
   },
   {
@@ -78,7 +76,7 @@
       "origin",
       "master"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "git fetch"
   },
   {
@@ -88,7 +86,7 @@
       "-f",
       "FETCH_HEAD"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "git checkout"
   },
   {
@@ -97,7 +95,7 @@
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "read revision",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
@@ -112,7 +110,7 @@
       "-d",
       "-x"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "git clean"
   },
   {
@@ -121,7 +119,7 @@
       "submodule",
       "sync"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "submodule sync"
   },
   {
@@ -132,7 +130,7 @@
       "--init",
       "--recursive"
     ],
-    "cwd": "[BUILD]/clone",
+    "cwd": "[ROOT]/b/build/clone",
     "name": "submodule update"
   },
   {