build: roll infra_paths changes

scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit.json

Index: scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit.json
diff --git a/scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit.json b/scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit.json
index 2fda07a2fe7dbc84e48af2856e750b0ab38586dc..5d1c57f92936902dba2f18a781397ba9c082fb39 100644
--- a/scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit.json
+++ b/scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit.json
@@ -6,9 +6,8 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
+      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
     ],
-    "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]"
     },
@@ -50,11 +48,11 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
+      "[CWD]/skia/tools/buildbot_spec.py",
       "/path/to/tmp/json",
       "Housekeeper-PerCommit"
     ],
-    "cwd": "[SLAVE_BUILD]/skia",
+    "cwd": "[CWD]/skia",
     "name": "exec buildbot_spec.py",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -89,25 +87,25 @@
       "make",
       "most"
     ],
-    "cwd": "[SLAVE_BUILD]/skia",
+    "cwd": "[CWD]/skia",
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_PATH": "[HOME]/src",
       "GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
-      "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Housekeeper-PerCommit"
+      "SKIA_OUT": "[CWD]/skia/out/Housekeeper-PerCommit"
     },
     "name": "build most"
   },
   {
     "cmd": [
       "python",
-      "[SLAVE_BUILD]/skia/platform_tools/android/tests/run_all.py"
+      "[CWD]/skia/platform_tools/android/tests/run_all.py"
     ],
-    "cwd": "[SLAVE_BUILD]/skia",
+    "cwd": "[CWD]/skia",
     "env": {
       "BUILDTYPE": "Release",
       "GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
-      "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Housekeeper-PerCommit"
+      "SKIA_OUT": "[CWD]/skia/out/Housekeeper-PerCommit"
     },
     "name": "android platform self-tests"
   },
@@ -115,13 +113,13 @@
     "cmd": [
       "python",
       "RECIPE_MODULE[build::skia]/resources/generate_and_upload_doxygen.py",
-      "[DEPOT_TOOLS]/third_party/gsutil/gsutil"
+      "[ROOT]/b/depot_tools/third_party/gsutil/gsutil"
     ],
-    "cwd": "[SLAVE_BUILD]/skia",
+    "cwd": "[CWD]/skia",
     "env": {
       "BUILDTYPE": "Release",
       "GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
-      "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Housekeeper-PerCommit"
+      "SKIA_OUT": "[CWD]/skia/out/Housekeeper-PerCommit"
     },
     "name": "generate and upload doxygen"
   },
@@ -133,7 +131,7 @@
       "--format=%at",
       "-s"
     ],
-    "cwd": "[SLAVE_BUILD]/skia",
+    "cwd": "[CWD]/skia",
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -142,19 +140,19 @@
       "python",
       "RECIPE_MODULE[build::skia]/resources/run_binary_size_analysis.py",
       "--library",
-      "[SLAVE_BUILD]/skia/out/Housekeeper-PerCommit/Release/lib/libskia.so",
+      "[CWD]/skia/out/Housekeeper-PerCommit/Release/lib/libskia.so",
       "--githash",
       "164710",
       "--commit_ts",
       "1408633190",
       "--gsutil_path",
-      "[DEPOT_TOOLS]/third_party/gsutil/gsutil"
+      "[ROOT]/b/depot_tools/third_party/gsutil/gsutil"
     ],
-    "cwd": "[SLAVE_BUILD]/skia",
+    "cwd": "[CWD]/skia",
     "env": {
       "BUILDTYPE": "Release",
       "GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
-      "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Housekeeper-PerCommit"
+      "SKIA_OUT": "[CWD]/skia/out/Housekeeper-PerCommit"
     },
     "name": "generate and upload binary size data"
   },