Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade bazlets to latest stable-2.15 to build with 2.15.11 API

Change-Id: I5d5e31cdf1d50871dcea6498c54e43199d376e61