Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I2644dd4244dec59518db299a352200aa4a6753c4