Merge branch 'stable-3.1'

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

Change-Id: I4ed233daed0174abb6fed9a07d185d9d9aab96fd