Merge branch 'stable-2.16'

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

Change-Id: I1befcd74b247d480c21fe154fc9add93ed01b29f