Merge branch 'stable-3.0'

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

Change-Id: Icbfc89febb0e7273eeb1d6a9e0a9a941c9a0224d