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: If17f4462ea9d7c3888bb6c59b0adf998a7fac19a