Merge "Fix CTS TextViewTest"