Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I75159a6d1c57976646f0d6056b0dd1c69f3409fa