Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Id21ef28e0fd54d35dfc85acb837b2cc22e06dc98