Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I3f8d97ab903e86cdd6079435b4c92e6a55472d90