Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-2.16 to build with 2.16.20 API

Change-Id: I833ab18447208b110ca80c54d5715fe4d8bbd790