Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I206e2b87c27d4bb8075dc2e5064247f5051fe894