Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Ibf0acc514d9f2492bbbc05d891a465a381218a5a