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