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