Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ifdff1882926f0df449a0af61444719812f37820c