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