Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I71588833dadfadc69ed4a4f26257d582af6c8fcb