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