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