Merge branch 'stable-3.1'

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

Change-Id: I2d0c441732300a8aaa5a0778edcc30dd0911fd05