rebase cpu hairlines

NOTRY=True
NOTREECHECKS=True
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/793393002
36 files changed