Merge branch 'stable-3.1'

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

Change-Id: Iba3f9897e8c7a2e073be218c9c0a25a55a6fdc55