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

* commit 'c3d0a81a4a1809446bc1fa9abc9b5b74b01e676e':
  Fix bug #8656546 API REVIEW: android.text.bidi / android.text