Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I501d210d28ba76799edee6b191c4ae10e13af9f6