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