GitLab

This reverts commit ab6eb7c4, with fix to
Mac.

Mac baselines have been updated.

Tbr: pdr@chromium.org
Change-Id: Iabb7b3a53965d2457f7a38088c90d4efb4461332
Reviewed-on: https://chromium-review.googlesource.com/c/1340875Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609397}