Merge branch 'stable-3.0'

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

Change-Id: I4657ca59092dacf297a96bf0acfbd5b1a8e04019