Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Upgrade bazlets to latest stable-2.16 to build with 2.16.20 API

Change-Id: Ie9f39d44b3a23cdd632bed94b1e34200473f5ff8