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