Merge "SkClipOp is now an enum class"