This reverts commit 6963de52.

Reason for revert: Wanted to land without NOTRY=true

Original change's description:
> Revert "Disable 2 layout tests after r548309 and add a TODO to reenable them"
> 
> This reverts commit f4132695.
> 
> Reason for revert: Rebaselining and reenabling the tests
> 
> Original change's description:
> > Disable 2 layout tests after r548309 and add a TODO to reenable them
> > 
> > BUG=787020
> > TBR=eae
> > 
> > Change-Id: I9931e0f0c73a6a0bb7dbade9c8c189acec1cb9d2
> > Reviewed-on: https://chromium-review.googlesource.com/997174
> > Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#548331}
> 
> TBR=eae@chromium.org,thomasanderson@chromium.org
> 
> Change-Id: Ifd643ac484dc11bbd4f922bd01445e94b7f88f53
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 787020
> Reviewed-on: https://chromium-review.googlesource.com/997113
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> Reviewed-by: Emil A Eklund <eae@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#548348}

TBR=eae@chromium.org,thomasanderson@chromium.org

Change-Id: Ibad78cf3b62ec0995708a425d0855449aaf3d04a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 787020
Reviewed-on: https://chromium-review.googlesource.com/997182Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548350}