Merge "Upgrade bazlets to latest master to build with 3.0.0 API"