Merge branch 'stable-3.0'

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

Change-Id: I68e1c22ee428fd9e5c1d6107db6b3f9fb67d5948