Revert "build: roll infra_paths changes"

scripts/slave/recipes/boringssl.expected/linux32.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "client.boringssl",
       "--builder",
       "linux32",
       "--slave",
       "slavename",
       "--spec",
-      "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'util/bot/DEPS', 'managed': True, 'name': 'boringssl', 'url': 'https://boringssl.googlesource.com/boringssl.git'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'util/bot/DEPS', 'managed': True, 'name': 'boringssl', 'url': 'https://boringssl.googlesource.com/boringssl.git'}]",
       "--root",
       "boringssl",
       "--revision_mapping_file",
       "{}",
       "--git-cache-dir",
-      "[ROOT]/b/build/slave/cache_dir",
+      "[GIT_CACHE]",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "boringssl@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@    \"boringssl\": \"HEAD\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {}, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"boringssl\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"properties\": {}, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"root\": \"boringssl\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
-      "[CWD]/boringssl/build"
+      "[SLAVE_BUILD]/boringssl/build"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "rmtree clean",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import os, 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@@@@",
       "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  chromium_utils.RemoveDirectory(sys.argv[1])@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
-      "[CWD]/boringssl/build",
+      "[SLAVE_BUILD]/boringssl/build",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs mkdir",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
       "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
       "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
       "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
       "@@@STEP_LOG_LINE@python.inline@  if os.path.exists(path):@@@",
       "@@@STEP_LOG_LINE@python.inline@    print \"%s exists but is not a dir\" % path@@@",
       "@@@STEP_LOG_LINE@python.inline@    sys.exit(1)@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.makedirs(path, mode)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/boringssl/util/bot/go/env.py",
-      "[CWD]/boringssl/util/bot/cmake-linux64/bin/cmake",
+      "[SLAVE_BUILD]/boringssl/util/bot/go/env.py",
+      "[SLAVE_BUILD]/boringssl/util/bot/cmake-linux64/bin/cmake",
       "-GNinja",
       "-DCMAKE_ASM_FLAGS=-m32 -msse2",
       "-DCMAKE_CXX_FLAGS=-m32 -msse2",
       "-DCMAKE_C_FLAGS=-m32 -msse2",
       "-DCMAKE_SYSTEM_NAME=Linux",
       "-DCMAKE_SYSTEM_PROCESSOR=x86",
-      "[CWD]/boringssl"
+      "[SLAVE_BUILD]/boringssl"
     ],
-    "cwd": "[CWD]/boringssl/build",
+    "cwd": "[SLAVE_BUILD]/boringssl/build",
     "name": "cmake"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/boringssl/util/bot/go/env.py",
+      "[SLAVE_BUILD]/boringssl/util/bot/go/env.py",
       "ninja",
       "-C",
-      "[CWD]/boringssl/build"
+      "[SLAVE_BUILD]/boringssl/build"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "ninja"
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/boringssl/util/bot/go/env.py",
+      "[SLAVE_BUILD]/boringssl/util/bot/go/env.py",
       "go",
       "run",
       "util/all_tests.go",
       "-json-output",
       "/path/to/tmp/json"
     ],
-    "cwd": "[CWD]/boringssl",
+    "cwd": "[SLAVE_BUILD]/boringssl",
     "name": "unit tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@test_utils.test_results@{@@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@  \"num_passes\": 9001, @@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@  \"num_regressions\": 0, @@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@  \"path_separator\": \"/\", @@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@  \"tests\": {@@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@    \"bad\": {@@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@      \"totally-bad-probably.html\": {@@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@        \"actual\": \"PASS\", @@@",
@@ skipping 28 matching lines @@
       "@@@STEP_LOG_LINE@test_utils.test_results@    }@@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@  }@@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@}@@@",
       "@@@STEP_LOG_END@test_utils.test_results@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[CWD]/boringssl/util/bot/go/env.py",
+      "[SLAVE_BUILD]/boringssl/util/bot/go/env.py",
       "go",
       "test",
       "-pipe",
       "-json-output",
       "/path/to/tmp/json"
     ],
-    "cwd": "[CWD]/boringssl/ssl/test/runner",
+    "cwd": "[SLAVE_BUILD]/boringssl/ssl/test/runner",
     "name": "ssl tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@test_utils.test_results@{@@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@  \"num_passes\": 9001, @@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@  \"num_regressions\": 0, @@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@  \"path_separator\": \"/\", @@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@  \"tests\": {@@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@    \"bad\": {@@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@      \"totally-bad-probably.html\": {@@@",
       "@@@STEP_LOG_LINE@test_utils.test_results@        \"actual\": \"PASS\", @@@",
@@ skipping 30 matching lines @@
       "@@@STEP_LOG_LINE@test_utils.test_results@}@@@",
       "@@@STEP_LOG_END@test_utils.test_results@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]