Merge "Migrate libandroidicu usage to libicu - mediaserver"