Merge branch 'stable-3.2' into master

* stable-3.2:
  Upgrade bazlets to latest stable-3.2 to build with 3.2.5.1 API
  Upgrade bazlets to latest stable-3.1 to build with 3.1.10 API

Change-Id: I2f66d98144befa520f41182074fd3a6d33921d8b