Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I38e8d82098c609c42d82712178e591284ff86389