Merge branch 'stable-3.0'

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

Change-Id: I8a6723bb0fa42414a7d2049fd1ac03d1b05b36c6