Merge branch 'stable-3.0'

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

Change-Id: Ib0e3e703d4fa36fe2d860075ddc58fdae29e1ee9