Merge "move alignment to Paint (from SkPaint)"