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: Iee71defe3786e1edb24ffdb1784579b542097ea3