build: roll infra_paths changes

scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_linux_memcheck.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "client.webrtc",
       "--builder",
       "Linux Memcheck",
       "--slave",
       "slavename",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'src/chromium/src/third_party/valgrind': 'https://chromium.googlesource.com/chromium/deps/valgrind/binaries'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]",
+      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'src/chromium/src/third_party/valgrind': 'https://chromium.googlesource.com/chromium/deps/valgrind/binaries'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\"}",
       "--git-cache-dir",
-      "[GIT_CACHE]",
+      "[ROOT]/b/build/slave/cache_dir",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@12345",
       "--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\": \"12345\"@@@",
@@ skipping 16 matching lines @@
       "@@@STEP_LOG_END@json.output@@@",
       "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
       "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
-      "[SLAVE_BUILD]/src/out"
+      "[CWD]/src/out"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "clean test output files"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
       "--show-path",
       "python",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "cleanup_temp"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "GYP_DEFINES": "build_for_tool=memcheck component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[BUILD]/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
+      "GYP_DEFINES": "build_for_tool=memcheck component=static_library dcheck_always_on=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/goma' rtc_use_264=1 target_arch=x64 use_goma=1",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
   },
   {
     "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",
       "--target",
       "Release",
       "--src-dir",
-      "[SLAVE_BUILD]/src",
+      "[CWD]/src",
       "--goma-cache-dir",
-      "[GOMA_CACHE]",
+      "[ROOT]/b/build/slave/goma_cache",
       "--build-tool",
       "ninja",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
       "/path/to/tmp/json",
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--goma-dir",
-      "[BUILD]/goma",
+      "[ROOT]/b/build/goma",
       "--",
       "All"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "compile",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
@@ skipping 12 matching lines @@
       "--annotate=gtest",
       "--test-type=audio_decoder_unittests",
       "--step-name=audio_decoder_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "audio_decoder_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "audio_decoder_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=common_audio_unittests",
       "--step-name=common_audio_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "common_audio_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "common_audio_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=common_video_unittests",
       "--step-name=common_video_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "common_video_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "common_video_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=modules_tests",
       "--step-name=modules_tests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "modules_tests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "modules_tests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=modules_unittests",
       "--step-name=modules_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "modules_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "modules_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=peerconnection_unittests",
       "--step-name=peerconnection_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "peerconnection_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "peerconnection_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=rtc_media_unittests",
       "--step-name=rtc_media_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "rtc_media_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "rtc_media_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=rtc_pc_unittests",
       "--step-name=rtc_pc_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "rtc_pc_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "rtc_pc_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=rtc_unittests",
       "--step-name=rtc_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "rtc_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "rtc_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=system_wrappers_unittests",
       "--step-name=system_wrappers_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "system_wrappers_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "system_wrappers_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=test_support_unittests",
       "--step-name=test_support_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "test_support_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "test_support_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=tools_unittests",
       "--step-name=tools_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "tools_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "tools_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=video_engine_tests",
       "--step-name=video_engine_tests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "video_engine_tests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "video_engine_tests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=voice_engine_unittests",
       "--step-name=voice_engine_unittests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "voice_engine_unittests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "voice_engine_unittests"
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
       "--target",
       "Release",
       "--xvfb",
       "--factory-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--build-properties",
       "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Linux Memcheck\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
       "--annotate=gtest",
       "--test-type=webrtc_nonparallel_tests",
       "--step-name=webrtc_nonparallel_tests",
       "--builder-name=Linux Memcheck",
       "--slave-name=slavename",
       "--build-number=1337",
       "--revision=f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--pass-build-dir",
       "--pass-target",
       "--run-shell-script",
-      "[SLAVE_BUILD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
+      "[CWD]/src/tools/valgrind-webrtc/webrtc_tests.sh",
       "--test",
       "webrtc_nonparallel_tests",
       "--tool",
       "memcheck"
     ],
-    "cwd": "[SLAVE_BUILD]",
     "name": "webrtc_nonparallel_tests"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]