Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev