Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I25945ec0eb9259ef37d2c0c28a44ef0bf93517e3