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