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