Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Idb6f39ca55e2eaef93008dded4828c1c5ebefaf1