Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Upgrade bazlets to latest stable-2.16 to build with 2.16.22 API Change-Id: I045532ba2cbf5d2c636de396fc705bd289e9eeba