Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I53f78cd75ccfad3c46e3e4acb4d64a6734d82bce