Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ia6014024c70ab6cb785a3e71663a26fe2e905e3e