Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I9563d33d749defe45d5a4bc8dfdfe0d7827c5f59