Merge "Fix TextViewTest.testHyphenationWidth"