rebase and update ignores

NOTRY=True
TBR=
BUG=skia:

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