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