Merge branch 'stable-3.1' into stable-3.2

* 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: I7bfe4d3bb3c9490580d6a0a5e0f9408dd4023dec