Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Fix plugin builds on OSX

Change-Id: I142a8ec12dcdf348830f64cf1928afbcb75979e0

tools/bzl/plugin.bzl

diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index d49e700..7534501 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -66,7 +66,7 @@
             "export TZ",
             "GEN_VERSION=$$(cat bazel-out/stable-status.txt | grep -w STABLE_BUILD_%s_LABEL | cut -d ' ' -f 2)" % dir_name.upper(),
             "cd $$TMP",
-            "unzip -q $$ROOT/$<",
+            "unzip -qo $$ROOT/$<",
             "echo \"Implementation-Version: $$GEN_VERSION\n$$(cat META-INF/MANIFEST.MF)\" > META-INF/MANIFEST.MF",
             "find . -exec touch '{}' ';'",
             "zip -Xqr $$ROOT/$@ .",