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