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