Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ia0f6bbc3ed53aa2a93a885d455eb04c49dc5d5f9