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