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