Merge branch 'stable-3.1'

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

Change-Id: I7a86083fa8781a3e1a7d3340c85cedc0f19e42dc