Merge "Remove libandroidicu usage"