Merge "Fix canvas crash in CanvasDrawTextTest"