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