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