Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I9abad7f5f34e9a0a28e2bf4c53a199ce31c810a8