Merge "Fix android.cts.text.TextUtilsTest#testEllipsize test" into jb-mr1-dev