Fix the installer and fixing the package shiped into binary version of Bazel.

--
MOS_MIGRATED_REVID=102567966

Author: damienmg

scripts/packages/template_bin.sh

@@ -135,7 +135,7 @@ echo -n "Uncompressing."
 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
 

tools/BUILD

@@ -22,8 +22,7 @@ filegroup(
 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",

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"},