Merge branch 'stable-3.2'

* stable-3.2:
  Upgrade bazlets to latest stable-2.16 to build with 2.16.20 API

Change-Id: Iad70616cc3e74b589ea1a6053dd5685586c9a495