Merge "Fix TextViewTest#testSingleLine" into froyo