Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ice6a6efcb48cf368a24d6b425cd51f2868065c09