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