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: Ic97ed4b119d9d4cd3cbbbbbf9f6e41580c472a3e