Revert "build: roll infra_paths changes"

scripts/slave/recipes/chromium_pgo.expected/full_tryserver_chromium_win_win_pgo.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "taskkill"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
       "--master",
       "tryserver.chromium.win",
       "--builder",
       "win_pgo",
       "--slave",
       "TestSlavename",
       "--spec",
-      "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
       "--git-cache-dir",
-      "[ROOT]\\b\\build\\slave\\cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
       "--force",
       "--output_manifest"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
@@ skipping 58 matching lines @@
       "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "GYP_DEFINES": "buildtype=Official chrome_pgo_phase=1 component=static_library fastbuild=0 target_arch=ia32 use_goma=0",
       "GYP_MSVS_VERSION": "2015",
-      "PATH": "[CWD]\\src\\out\\Release;%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
+      "PATH": "[SLAVE_BUILD]\\src\\out\\Release;%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient Runhooks: Instrumentation phase."
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\nchromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])\n",
       "*.pg[cd]",
-      "[CWD]\\src\\out\\Release"
+      "[SLAVE_BUILD]\\src\\out\\Release"
     ],
-    "name": "rmwildcard *.pg[cd] in [CWD]\\src\\out\\Release",
+    "cwd": "[SLAVE_BUILD]",
+    "name": "rmwildcard *.pg[cd] in [SLAVE_BUILD]\\src\\out\\Release",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
       "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@chromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
       "--show-path",
       "python",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\compile.py",
       "--gsutil-py-path",
       "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
       "--ninja-path",
       "RECIPE_PACKAGE_REPO[depot_tools]\\ninja.exe",
       "--target",
       "Release",
       "--src-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--goma-cache-dir",
-      "[ROOT]\\b\\build\\slave\\goma_cache",
+      "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--",
       "chrome"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
-      "PATH": "[CWD]\\src\\out\\Release;%(PATH)s"
+      "PATH": "[SLAVE_BUILD]\\src\\out\\Release;%(PATH)s"
     },
     "name": "Compile: Instrumentation phase."
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "page_cycler.morejs"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: page_cycler.morejs"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.jslibstyleprototype"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.jslibstyleprototype"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.jslibeventprototype"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.jslibeventprototype"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "speedometer"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: speedometer"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "smoothness.top_25_smooth"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: smoothness.top_25_smooth"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "octane"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: octane"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "blink_perf.svg"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: blink_perf.svg"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.jslibtraverseprototype"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.jslibtraverseprototype"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "blink_style.top_25"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: blink_style.top_25"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.domcoreattr"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.domcoreattr"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "blink_perf.dom"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: blink_perf.dom"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.jslibattrprototype"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.jslibattrprototype"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "sunspider"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: sunspider"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "media.mse_cases"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: media.mse_cases"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "v8.infinite_scroll"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: v8.infinite_scroll"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "blink_perf.events"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: blink_perf.events"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.domcoretraverse"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.domcoretraverse"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.domcoremodify"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.domcoremodify"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.cssqueryjquery"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.cssqueryjquery"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "indexeddb_perf"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: indexeddb_perf"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "blink_perf.canvas"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: blink_perf.canvas"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.domcorequery"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.domcorequery"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "blink_perf.bindings"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: blink_perf.bindings"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.jslibtraversejquery"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.jslibtraversejquery"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "dromaeo.jslibmodifyprototype"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: dromaeo.jslibmodifyprototype"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "blink_perf.css"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: blink_perf.css"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::pgo]\\resources\\run_benchmark.py",
       "--checkout-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--browser-type",
       "release",
       "--target-bits",
       "32",
       "--build-dir",
-      "[CWD]\\src\\out\\Release",
+      "[SLAVE_BUILD]\\src\\out\\Release",
       "--benchmark",
       "blink_perf.paint"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "Telemetry benchmark: blink_perf.paint"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
       "GYP_DEFINES": "buildtype=Official chrome_pgo_phase=2 component=static_library fastbuild=0 target_arch=ia32 use_goma=0",
       "GYP_MSVS_VERSION": "2015",
       "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient Runhooks: Optimization phase."
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
       "--show-path",
       "python",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\compile.py",
       "--gsutil-py-path",
       "RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py",
       "--ninja-path",
       "RECIPE_PACKAGE_REPO[depot_tools]\\ninja.exe",
       "--target",
       "Release",
       "--src-dir",
-      "[CWD]\\src",
+      "[SLAVE_BUILD]\\src",
       "--goma-cache-dir",
-      "[ROOT]\\b\\build\\slave\\goma_cache",
+      "[GOMA_CACHE]",
       "--build-tool",
       "ninja",
       "--",
       "chrome"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
     },
     "name": "Compile: Optimization phase."
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\tools\\runit.py",
       "--show-path",
       "python",
       "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\zip_build.py",
       "--target",
       "Release",
       "--build-url",
       "gs://chromium-fyi-archive/win_pgo_builds",
       "--factory-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"win_pgo\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"recipe\": \"chromium_pgo\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"win_pgo\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"recipe\": \"chromium_pgo\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "package build"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]