Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I9bd305d73a4dc6b4baf367b2ea6e527d7adf3482