Merge branch 'stable-3.2' into stable-3.3

* 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: I45825e6099fbc3f5ea947a7413df3364e0def70e