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