Merge "LayoutLib: Fix multi-line text rendering." into honeycomb