rebase and update ignore

TBR=
NOTRY=True
BUG=skia:

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