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