Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Iefbbc6923830a98c6e91c0816e4d50ec3f157088