--- scripts/bootstrap/bootstrap.sh.orig	2017-03-07 08:07:48 UTC
+++ scripts/bootstrap/bootstrap.sh
@@ -43,7 +43,7 @@ else
         --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
         --spawn_strategy=standalone \
         --nojava_header_compilation \
-        --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \
+        --strategy=Javac=standalone --ignore_unsupported_sandboxing \
         --compilation_mode=opt \
         ${EXTRA_BAZEL_ARGS:-}"
 fi
--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig	2017-03-31 21:28:24 UTC
+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
@@ -32,7 +32,7 @@ if IsWindows() and not PYTHON_BINARY.end
 
 # Find a file in a given search path.
 def SearchPath(name):
-  search_path = os.getenv('PATH', os.defpath).split(os.pathsep)
+  search_path = os.getenv('PATH', os.defpath + ":@l_prefix@/bin").split(os.pathsep)
   for directory in search_path:
     if directory == '': continue
     path = os.path.join(directory, name)