Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade bazlets to latest stable-2.16 to build with 2.16.15 API

Change-Id: I9bb4ef6f0d50affe488a7f6b3249bee02f94a372