Apply refactorings and upgrade bazlets to latest

Upgrade bazlets to latest master to build with 3.0.0-rc1 API

Change-Id: I44a1ba8efb163894641694a614bc1ce4015b4a45
6 files changed