Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I0be41b58172c11294c39994ddf1582b43f1782f0