Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade bazlets to latest stable-3.0 to build with 3.0.7 API
  Upgrade bazlets to latest stable-2.16 to build with 2.16.16 API

Change-Id: I22492f605fb52a5c0a231a9f17e4736d95a9f22d