Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Icc1434669fab7f3b91c385f23d418e2533f84222