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