Merge "Fix TextViewTest#testAccessError" into honeycomb