Merge "Improve TextView.onMeasure() for multiline text."