Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ie07df7dd9cc9f39e89af3e6f3c08303a264e1f41