Merge "Reapply "Refactor setting an SkPaint onto a hwui Layer.""