Reland "Skia: Maintain a checkout on swarming (compile) bots"

scripts/slave/recipes/skia/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
       "/path/to/tmp/json",
       "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
@@ skipping 60 matching lines @@
       "[SLAVE_BUILD]/skia/tools/llvm_coverage_build",
       "dm"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "BUILDTYPE": "Coverage",
       "CC": "/usr/bin/clang-3.6",
       "CHROME_HEADLESS": "1",
       "CXX": "/usr/bin/clang++-3.6",
       "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
-      "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
+      "PATH": "[DEPOT_TOOLS]:%(PATH)s",
+      "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "build dm"
   },
   {
     "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",
       "[SLAVE_BUILD]/out/coverage_results"
@@ skipping 81 matching lines @@
       "--outResultsFile",
       "[SLAVE_BUILD]/out/coverage_results/abc123.cov"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "BUILDTYPE": "Coverage",
       "CC": "/usr/bin/clang-3.6",
       "CHROME_HEADLESS": "1",
       "CXX": "/usr/bin/clang++-3.6",
       "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
-      "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
+      "PATH": "[DEPOT_TOOLS]:%(PATH)s",
+      "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "dm"
   },
   {
     "cmd": [
       "python",
       "[SLAVE_BUILD]/skia/tools/parse_llvm_coverage.py",
       "--report",
       "[SLAVE_BUILD]/out/coverage_results/abc123.cov",
@@ skipping 30 matching lines @@
       "patchset",
       "1"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "BUILDTYPE": "Coverage",
       "CC": "/usr/bin/clang-3.6",
       "CHROME_HEADLESS": "1",
       "CXX": "/usr/bin/clang++-3.6",
       "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0",
-      "PATH": "[SLAVE_BUILD]/depot_tools:%(PATH)s",
+      "PATH": "[DEPOT_TOOLS]:%(PATH)s",
+      "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "Generate Coverage Data"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n  with open(sys.argv[2], 'w') as f:\n    json.dump(os.listdir(sys.argv[1]), f)\n",
       "[SLAVE_BUILD]/out/coverage_results",
@@ skipping 33 matching lines @@
       "[SWARM_OUT_DIR]"
     ],
     "name": "Copy to swarming out (2)"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]