Merge branch 'stable-3.1'

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

Change-Id: I352b32e5ff7e5cd484a565173016d4f8c795b195