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: I4fb6cfd22d30573de4fc21db386502dc228ee5d6