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