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