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