Merge "Make TextLayoutCache no more dependent on ICU"