Merge "Improve correctness of SkiaCanvas::drawLayoutOnPath"