Revert "build: roll infra_paths changes"

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

Index: scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit-Trybot.json
diff --git a/scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit-Trybot.json b/scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit-Trybot.json
index f56fbe03015721da17a4496254af1814dd7cbc2c..d5967441b3829f932be265e0a753602ae9eaa6af 100644
--- a/scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit-Trybot.json
+++ b/scripts/slave/recipes/skia/housekeeper_percommit.expected/Housekeeper-PerCommit-Trybot.json
@@ -6,8 +6,9 @@
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "config",
       "--spec",
-      "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']"
+      "cache_dir = '[GIT_CACHE]'\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]"
     },
@@ -28,6 +29,7 @@
       "--output-json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -48,11 +50,11 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/skia/tools/buildbot_spec.py",
+      "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
       "/path/to/tmp/json",
       "Housekeeper-PerCommit-Trybot"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "name": "exec buildbot_spec.py",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -87,25 +89,25 @@
       "make",
       "most"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_PATH": "[HOME]/src",
       "GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
-      "SKIA_OUT": "[CWD]/skia/out/Housekeeper-PerCommit-Trybot"
+      "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Housekeeper-PerCommit-Trybot"
     },
     "name": "build most"
   },
   {
     "cmd": [
       "python",
-      "[CWD]/skia/platform_tools/android/tests/run_all.py"
+      "[SLAVE_BUILD]/skia/platform_tools/android/tests/run_all.py"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "BUILDTYPE": "Release",
       "GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
-      "SKIA_OUT": "[CWD]/skia/out/Housekeeper-PerCommit-Trybot"
+      "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Housekeeper-PerCommit-Trybot"
     },
     "name": "android platform self-tests"
   },
@@ -117,7 +119,7 @@
       "--format=%at",
       "-s"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
@@ -126,21 +128,21 @@
       "python",
       "RECIPE_MODULE[build::skia]/resources/run_binary_size_analysis.py",
       "--library",
-      "[CWD]/skia/out/Housekeeper-PerCommit-Trybot/Release/lib/libskia.so",
+      "[SLAVE_BUILD]/skia/out/Housekeeper-PerCommit-Trybot/Release/lib/libskia.so",
       "--githash",
       "164710",
       "--commit_ts",
       "1408633190",
       "--gsutil_path",
-      "[ROOT]/b/depot_tools/third_party/gsutil/gsutil",
+      "[DEPOT_TOOLS]/third_party/gsutil/gsutil",
       "--issue_number",
       "500"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "BUILDTYPE": "Release",
       "GYP_DEFINES": "skia_shared_lib=1 skia_warnings_as_errors=0",
-      "SKIA_OUT": "[CWD]/skia/out/Housekeeper-PerCommit-Trybot"
+      "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Housekeeper-PerCommit-Trybot"
     },
     "name": "generate and upload binary size data"
   },