Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Iae1e8459d79fce6544eaa2efe942fd2829464c7d