rm flag and rebaseline

Bug: 899689
Change-Id: Ie69dda53e3be3b2ec1113cea5f763e2e016f26bd
Reviewed-on: https://chromium-review.googlesource.com/c/1358693
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613288}