Merge branch 'stable-2.16'

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

Change-Id: I17935213a144acb4218e6ff296b2d1f1711e976d