Merge branch 'stable-3.0'

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

Change-Id: I6151d09de4031c4a25548b1604659b7b7c31f00d