Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I7bbda4f9cee4a61929795dccf1934842c7e0b06d