Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Upgrade bazlets to latest stable-2.16 to build with 2.16.18 API
  Bump Bazel version to 3.1.0
  Bump Bazel version to 3.0.0

Change-Id: I88502aa2a28957fad4b011175be5175f1d0a3bb0
diff --git a/.bazelversion b/.bazelversion
index ccbccc3..fd2a018 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-2.2.0
+3.1.0