Merge branch 'stable-3.1'

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

Change-Id: Ie008acab890b6919e5955bdeda22b32134f002c8