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