Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 2.2.0

Change-Id: I745d72a44ee556c2ee6697c5c28dc2060cd44dbb
diff --git a/.bazelversion b/.bazelversion
index 7ec1d6d..ccbccc3 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-2.1.0
+2.2.0