am 22e1a9ab: Merge "Remove ICU from LayoutLib." into mnc-dev

* commit '22e1a9ab033119848c0c83b7961110e800b81c34':
  Remove ICU from LayoutLib.