Merge branch 'stable-3.1'

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

Change-Id: I6a91932bd6868d38dd09579699629528d71fa3a6