Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I9dbb7d9d5ca9ed9bc05a44e4c22b725cfc64be82