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

--
MOS_MIGRATED_REVID=102567966
diff --git a/scripts/packages/template_bin.sh b/scripts/packages/template_bin.sh
index 880b430..91fc86d 100755
--- a/scripts/packages/template_bin.sh
+++ b/scripts/packages/template_bin.sh
@@ -135,7 +135,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