Merge branch 'stable-3.0' * stable-3.0: Upgrade bazlets to latest stable-3.0 to build with 3.0.4 API Upgrade bazlets to latest stable-2.16 to build with 2.16.13 API Change-Id: I5bed5e904915d72681f25e76c0d641dc621ac943