Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I32ccd5de9d2cbb196ad967ca18a6b650b7cde7c7