Merge branch 'stable-3.1'

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

Change-Id: I1f087b47393a82ecd378bbe88de78a0ed18e22ea