Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Upgrade bazlets to latest stable-2.16 to build with 2.16.20 API Change-Id: I4f8387ce27bab835efcd9fa33284a1250e79bd8a