Merge branch 'stable-3.1'

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

Change-Id: I3ef216d951d71e42ad312136b10c0eb4e1a1df3e