Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade bazlets to build with 2.16.7 API

Change-Id: I218f0ea9084c7cab7ad79ff6004e92ac91783cdc