am ae404e89: am 73b280c7: Merge "Fix android.cts.text.TextUtilsTest#testEllipsize test" into jb-mr1-dev

* commit 'ae404e8990d0e1ad2a13faf1245235c2b9b5f3e0':
  Fix android.cts.text.TextUtilsTest#testEllipsize test