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: Ifeaf1b46cf9b4b5a21e19eb07d7e00389339ecc6