Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-3.0 to build with 3.0.12 API
  Upgrade bazlets to latest stable-2.16 to build with 2.16.22 API

Change-Id: I017ff898de30dcdc786d124d2d6e4868a68494b4