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