Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I08fae3342c9f2a228a90f6111f3862f8170a47f0