Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: I95dc97af884d59d2d89705311456f3d39d80d5d6