Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade bazlets to latest stable-2.15
  Update bazlets to fix build with bazel 0.23

Change-Id: I9909ab540f3ef36f23bd673f14808409f2c516e0