Merge branch 'stable-3.1'

* stable-3.1:
  Fix bazlets using latest stable-3.1 to build with 3.1.5 API
  Upgrade bazlets to latest stable-3.1 to build with 3.1.5 API
  Upgrade bazlets to latest stable-3.0 to build with 3.0.9 API
  Upgrade bazlets to latest stable-2.16 to build with 2.16.19 API

Change-Id: Ibf932f7549febe5c9f42056052becc8a3f619102