Merge "Remove ICU from LayoutLib." into mnc-dev