rebase and remove ignores

NOTRY=True
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/788193005