Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Iaee03cceb0e2de51215b11de3b16c2dc7e609d37