GitLab

Since the underlying issue with grit has been addressed, reland this
change.

Bug: 1132403, 1150466
Change-Id: Icdf25bae36b3f525f1b0319621dbbd112e95917f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566747
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832541}