Merge "brillo: Remove dependency on java for Brillo" into brillo-m7-mr-dev