Merge branch 'stable-3.0' into stable-3.1

* 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: I300d3f0fafef7a1769880c0ba4216db606699706