Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/infra.expected/Infra-PerCommit_initialcheckout.json

 [
   {
     "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]/go/src",
+      "[SLAVE_BUILD]/go/src",
       "511"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "makedirs makedirs go/src",
     "~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": [
       "git",
       "clone",
       "https://skia.googlesource.com/buildbot",
-      "[CWD]/go/src/go.skia.org/infra"
+      "[SLAVE_BUILD]/go/src/go.skia.org/infra"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "git clone"
   },
   {
     "cmd": [
       "git",
       "fetch",
       "origin"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git fetch"
   },
   {
     "cmd": [
       "git",
       "clean",
       "-d",
       "-f"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git clean"
   },
   {
     "cmd": [
       "git",
       "reset",
       "--hard",
       "origin/master"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git reset"
   },
   {
     "cmd": [
       "go",
       "get",
       "-u",
       "./..."
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "env": {
       "GIT_USER_AGENT": "git/1.9.1",
-      "GOPATH": "[CWD]/go",
-      "PATH": "[CWD]/go/bin:%(PATH)s"
+      "GOPATH": "[SLAVE_BUILD]/go",
+      "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
     },
     "name": "update_deps"
   },
   {
     "cmd": [
       "git",
       "clone",
       "https://skia.googlesource.com/buildbot",
-      "[CWD]/go/src/go.skia.org/infra"
+      "[SLAVE_BUILD]/go/src/go.skia.org/infra"
     ],
+    "cwd": "[SLAVE_BUILD]",
     "name": "git clone (2)"
   },
   {
     "cmd": [
       "git",
       "fetch",
       "origin"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git fetch (2)"
   },
   {
     "cmd": [
       "git",
       "clean",
       "-d",
       "-f"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git clean (2)"
   },
   {
     "cmd": [
       "git",
       "reset",
       "--hard",
       "origin/master"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git reset (2)"
   },
   {
     "cmd": [
       "git",
       "rev-parse",
       "HEAD"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "name": "git rev-parse",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
       "@@@SET_BUILD_PROPERTY@got_revision@\"abc123\"@@@"
     ]
   },
   {
     "cmd": [
       "go",
       "get",
       "golang.org/x/tools/cmd/goimports"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "env": {
       "GIT_USER_AGENT": "git/1.9.1",
-      "GOPATH": "[CWD]/go",
-      "PATH": "[CWD]/go/bin:%(PATH)s"
+      "GOPATH": "[SLAVE_BUILD]/go",
+      "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
     },
     "name": "install goimports"
   },
   {
     "cmd": [
       "go",
       "get",
       "github.com/kisielk/errcheck"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "env": {
       "GIT_USER_AGENT": "git/1.9.1",
-      "GOPATH": "[CWD]/go",
-      "PATH": "[CWD]/go/bin:%(PATH)s"
+      "GOPATH": "[SLAVE_BUILD]/go",
+      "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
     },
     "name": "install errcheck"
   },
   {
     "cmd": [
       "./setup_test_db"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra/go/database",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra/go/database",
     "env": {
       "GIT_USER_AGENT": "git/1.9.1",
-      "GOPATH": "[CWD]/go",
-      "PATH": "[CWD]/go/bin:%(PATH)s"
+      "GOPATH": "[SLAVE_BUILD]/go",
+      "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
     },
     "name": "setup database"
   },
   {
     "cmd": [
       "python",
       "-u",
       "run_unittests"
     ],
-    "cwd": "[CWD]/go/src/go.skia.org/infra",
+    "cwd": "[SLAVE_BUILD]/go/src/go.skia.org/infra",
     "env": {
       "GIT_USER_AGENT": "git/1.9.1",
-      "GOPATH": "[CWD]/go",
+      "GOPATH": "[SLAVE_BUILD]/go",
       "KARMA_PORT": "15001",
-      "PATH": "[CWD]/go/bin:%(PATH)s"
+      "PATH": "[SLAVE_BUILD]/go/bin:%(PATH)s"
     },
     "name": "run_unittests"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]