Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade bazlets to latest stable-2.16

Change-Id: I0c291533fb3e91a1a33f09ec4fa5a6d1f80138e3