diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 6d6133e3..bc4e679a 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -4,7 +4,8 @@ matrix:
   bazel: [
     7.4.1,
     8.0.0rc7,
-    last_green,
+# Temporarily disabled until java_stub_template.txt is public
+#    last_green,
   ]
 
 tools_flags: &tools_flags
diff --git a/rules/android_sdk_repository/helper.bzl b/rules/android_sdk_repository/helper.bzl
index 514ef19e..ec1f8800 100644
--- a/rules/android_sdk_repository/helper.bzl
+++ b/rules/android_sdk_repository/helper.bzl
@@ -298,7 +298,7 @@ def create_android_sdk_rules(
             outs = [tool + "_runner.sh"],
             cmd = "\n".join([
                 "cat > $@ << 'EOF'",
-                "#!/bin/bash",
+                "#!/usr/bin/env bash",
                 "set -eu",
                 # The tools under build-tools/VERSION require the libraries under
                 # build-tools/VERSION/lib, so we can't simply depend on them as a