Merge branch 'stable-3.1'

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

Change-Id: I3d0319d90ef032d5d6f015fef24f33937206fcf0