Merge branch 'stable-3.0' * stable-3.0: Upgrade bazlets to latest stable-2.16 Change-Id: Ide58f8322fedb5eba62922f4473d5460771c40eb