Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade bazlets to latest stable-2.16

Change-Id: Id14ce58ee5789ae04c466df1565f670779f8fc5a