Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json

Index: scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json
diff --git a/scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json b/scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json
index 94d508822b7df5f8f0dfd61b157220f52ee13a50..cd5564f1b1e5234d0c4e712c00fc8a6a1d10bbed 100644
--- a/scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.json
+++ b/scripts/slave/recipes/skia/skia.expected/Build-Mac10.8-Clang-Arm7-Debug-Android.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.8-Clang-Arm7-Debug-Android"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "name": "exec buildbot_spec.py",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -134,12 +136,13 @@
       "-u",
       "import json\nimport subprocess\nimport sys\n\nccache = None\ntry:\n  ccache = subprocess.check_output(['which', 'ccache']).rstrip()\nexcept:\n  pass\nprint json.dumps({'ccache': ccache})\n"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "BUILDTYPE": "Debug",
       "CC": "/usr/bin/clang",
       "CXX": "/usr/bin/clang++",
       "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0",
-      "SKIA_OUT": "[CWD]/skia/out/Build-Mac10.8-Clang-Arm7-Debug-Android"
+      "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Build-Mac10.8-Clang-Arm7-Debug-Android"
     },
     "name": "has ccache?",
     "stdout": "/path/to/tmp/json",
@@ -163,13 +166,13 @@
   },
   {
     "cmd": [
-      "[CWD]/skia/platform_tools/android/bin/android_ninja",
+      "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_ninja",
       "most",
       "-d",
       "arm_v7_neon",
       "--clang"
     ],
-    "cwd": "[CWD]/skia",
+    "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "ANDROID_HOME": "/Users/chrome-bot/adt-bundle-mac-x86_64-20140702/sdk",
       "ANDROID_SDK_ROOT": "/Users/chrome-bot/adt-bundle-mac-x86_64-20140702/sdk",
@@ -178,7 +181,7 @@
       "CXX": "/usr/bin/clang++",
       "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_warnings_as_errors=0",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
-      "SKIA_OUT": "[CWD]/skia/out/Build-Mac10.8-Clang-Arm7-Debug-Android"
+      "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Build-Mac10.8-Clang-Arm7-Debug-Android"
     },
     "name": "build most"
   },