Merge branch 'stable-3.1'

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

Change-Id: I1aee05bbfe6a4c938d9ba587e5f13a93bbd85bfb