Merge branch 'stable-2.16'

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

Change-Id: Id3dd842c33f7b28714d64ed5024e210248f948fb