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