Merge "LayoutLib: fix support for textScaleX."