Merge "Fix for bug 8631592 android.widget.cts.TextViewTest#testGetFocusedRect" into jb-mr2-dev