Merge branch 'stable-3.1'

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

Change-Id: I75e9ba9f939c55322d6e84d9be75c0076312d3c5