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