Merge "brillo: Remove dependency on icu for Brillo." am: 4472c761cc
am: 2d3c845709  -s ours

* commit '2d3c8457090109d88e8829b7bd8968837dca409a':
  brillo: Remove dependency on icu for Brillo.