GitLab

This reverts commit 64d75f14 and relands
commit 3f4fcf06.

Reason for original revert: Broke internal build.
Reason for reland: Deps have rolled, so the internal build should work
now.

TBR=oshima@chromium.org

Bug: 1068516
Change-Id: Ifa114f2a92aa7ba0bfc6f35981b3cb29895f403b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209494
Commit-Queue: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Sahel Sharify <sahel@chromium.org>
Auto-Submit: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771962}