Merge branch 'stable-3.1' into 'stable-3.2'

* stable-3.1:
  Upgrade bazlets to latest stable-3.1 to build with 3.1.11 API

Change-Id: I214ffbfbdbbddec87d8f94875b0e09a6f2b4c7f7