build: roll infra_paths changes

scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorFalse.json

Index: scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorFalse.json
diff --git a/scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorFalse.json b/scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorFalse.json
index 04ba8987e038490a958841dffd5f51ce6444383b..7813d378e51e272aa97da94b788bbb66a191fb91 100644
--- a/scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorFalse.json
+++ b/scripts/slave/recipes/dart/dartium_build.expected/basic_mac_64_MirrorFalse.json
@@ -6,9 +6,8 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'dartium.deps', 'url': 'https://dart.googlecode.com/svn/branches/bleeding_edge/deps/dartium.deps'}]"
+      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'dartium.deps', 'url': 'https://dart.googlecode.com/svn/branches/bleeding_edge/deps/dartium.deps'}]"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -29,7 +28,6 @@
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -76,10 +74,9 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' linux_strip_binary=1 target_arch=x64 use_goma=1",
+      "GYP_DEFINES": "clang=1 component=static_library gomadir='[ROOT]/b/build/goma' linux_strip_binary=1 target_arch=x64 use_goma=1",
       "GYP_GENERATORS": "ninja",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -92,11 +89,10 @@
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
       "--src-dir",
-      "[SLAVE_BUILD]/src",
+      "[CWD]/src",
       "--output-json",
       "/path/to/tmp/json"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -123,9 +119,9 @@
       "--target",
       "Release",
       "--src-dir",
-      "[SLAVE_BUILD]/src",
+      "[CWD]/src",
       "--goma-cache-dir",
-      "[GOMA_CACHE]",
+      "[ROOT]/b/build/slave/goma_cache",
       "--build-tool",
       "ninja",
       "--compiler",
@@ -135,12 +131,11 @@
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--goma-dir",
-      "[BUILD]/goma",
+      "[ROOT]/b/build/goma",
       "--",
       "All",
       "chromium_builder_tests"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
@@ -154,10 +149,9 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/dart/tools/dartium/multivm_archive.py",
+      "[CWD]/src/dart/tools/dartium/multivm_archive.py",
       "12345"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "archive_build"
   },
   {