Merge branch 'stable-3.1'

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

Change-Id: I69f808d155983d13702abcc1c3343740d285ac3a