diff --git a/scripts/packages/template_bin.sh b/scripts/packages/template_bin.sh
index 2fb73bf..803b02a 100755
--- a/scripts/packages/template_bin.sh
+++ b/scripts/packages/template_bin.sh
@@ -132,7 +132,7 @@
 if [ -f "${bin}/bazel" ]; then
   rm -f "${bin}/bazel"
 fi
-if [ -d "${base}" && -x "${base}/bin/bazel" ]; then
+if [ -d "${base}" -a -x "${base}/bin/bazel" ]; then
   rm -fr "${base}"
 fi
 
diff --git a/tools/BUILD b/tools/BUILD
index 7e75c44..a2df391 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -22,8 +22,7 @@
 filegroup(
     name = "package-srcs",
     srcs = glob(["**"]) + [
-        "//tools/android:srcs",
-        "//tools/android/jack:srcs",
+        "//tools/build_defs/d:srcs",
         "//tools/build_defs/docker:srcs",
         "//tools/build_rules/appengine:srcs",
         "//tools/build_rules/closure:srcs",
diff --git a/tools/build_defs/d/BUILD b/tools/build_defs/d/BUILD
index 7d5b723..fe938fc 100644
--- a/tools/build_defs/d/BUILD
+++ b/tools/build_defs/d/BUILD
@@ -1,5 +1,10 @@
 package(default_visibility = ["//visibility:public"])
 
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+)
+
 config_setting(
     name = "darwin",
     values = {"host_cpu": "darwin"},