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