Manually rebaseline some paint/invalidation tests
For bug 636271, rebaseline the test to produce new format, but still
keep the failure line in case it's still flaky.
For bug 658605, NeedsRebaseline didn't work because of bug 660580.
Manually rebaseline it to ensure test coverage.
BUG=
636271,
658605
Committed:
https://crrev.com/3bc6c4619f272fb08cb4ca1520b4f20bf2cd9ee8
Cr-Commit-Position: refs/heads/master@{#436047}