Various complex clip rebases

TBR=
NOTRY=

BUG=skia:

Review URL: https://codereview.chromium.org/806223006
7 files changed