Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/skia.expected/Build-Mac10.9-Clang-Arm7-Debug-iOS.json

Index: scripts/slave/recipes/skia/skia.expected/Build-Mac10.9-Clang-Arm7-Debug-iOS.json
diff --git a/scripts/slave/recipes/skia/skia.expected/Build-Mac10.9-Clang-Arm7-Debug-iOS.json b/scripts/slave/recipes/skia/skia.expected/Build-Mac10.9-Clang-Arm7-Debug-iOS.json
index 7d2a551df738982b8ab083985efababa4530fe3b..5253cc1c3d57b2fd3f0d2ece1576a02729d6e554 100644
--- a/scripts/slave/recipes/skia/skia.expected/Build-Mac10.9-Clang-Arm7-Debug-iOS.json
+++ b/scripts/slave/recipes/skia/skia.expected/Build-Mac10.9-Clang-Arm7-Debug-iOS.json
@@ -7,7 +7,7 @@
       "origin",
       "https://skia.googlesource.com/skia.git"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "name": "git remote set-url"
   },
   {
@@ -15,7 +15,7 @@
       "git",
       "fetch"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "name": "git fetch"
   },
   {
@@ -25,7 +25,7 @@
       "--hard",
       "abc123"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "name": "git reset"
   },
   {
@@ -35,7 +35,7 @@
       "-d",
       "-f"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "name": "git clean"
   },
   {
@@ -45,8 +45,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]"
     },
@@ -67,6 +68,7 @@
       "--output-json",
       "/path/to/tmp/json"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
@@ -87,11 +89,11 @@
     "cmd": [
       "python",
       "-u",
-      "[CWD]/skia/tools/buildbot_spec.py",
+      "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
       "/path/to/tmp/json",
       "Build-Mac10.9-Clang-Arm7-Debug-iOS"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "name": "exec buildbot_spec.py",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -129,15 +131,15 @@
   },
   {
     "cmd": [
-      "[CWD]/skia/platform_tools/ios/bin/ios_ninja"
+      "[SLAVE_BUILD]/skia/platform_tools/ios/bin/ios_ninja"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "BUILDTYPE": "Debug",
       "CC": "/usr/bin/clang",
       "CXX": "/usr/bin/clang++",
       "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=1",
-      "SKIA_OUT": "[CWD]/skia/out/Build-Mac10.9-Clang-Arm7-Debug-iOS"
+      "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Build-Mac10.9-Clang-Arm7-Debug-iOS"
     },
     "name": "build iOSShell"
   },