Merge "Add unit tests for bug #5037425 Canvas.drawText can't handle Right-to-Left text and text composing"