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