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