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