Merge "ImageGenerator: switch to BreakIterator from icu library" am: 86936c46a8
am: 49ba6fc534

Change-Id: I0c1e4302815e271d2262ca2d1807f3fb57c3a589