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