Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade bazlets to latest stable-2.16

Change-Id: Ibc2557dbe4d0d43c251e14fff80726ee5a76227d