Merge branch 'stable-3.1' into master

* stable-3.1:
  Bump Bazel version to 3.7.0
  Upgrade bazlets to latest stable-3.0 to build with 3.0.13 API

Change-Id: I35ad9d1c6df4f94b80ee4f5a9c727c2182c8aef1