Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade bazlets to latest stable-3.0 to build with 3.0.6 API
  Upgrade bazlets to latest stable-2.16 to build with 2.16.15 API

Change-Id: I82a130fe7a64d0b6c1a2b598402b42b5df043a37