Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I7e6b10e93a4b9946e2020dad7855ef981c6386a3