Merge branch 'stable-3.1'

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

Change-Id: I1f7643b275768cab476c97f20b15843ceff163d4