Merge "switch over clip calls to use SkClipOp instead of SkRegion::Op"