Merge branch 'stable-3.1'

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

Change-Id: Icf3637cea203b63a7cd9bc487ae69ca16d8b7c9e