Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Icfa9ca0622c1c0a5bfc4abde29288d9bba363b4e