Merge "brillo: Remove dependency on java for Brillo"