GitLab

Both bots are red; this improves things a bit (but likely not completely,
I only looked at a handful recent builds each).

Bug: 897969,897970,330262
Change-Id: I2c399774175e57285eafc1c0de99a6f893e62fea
Reviewed-on: https://chromium-review.googlesource.com/c/1295270Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601785}