Merge "brillo: Remove dependency on java for Brillo" am: 6c8e3e4108
am: fd5d6f440a

* commit 'fd5d6f440a13643f4e645e960e1f2c417af3355a':
  brillo: Remove dependency on java for Brillo