GitLab

Simplifies the config, and fixes an oversight were the tests were running
on the regular cros bots, but not on the cros memory bots.

Bug: 843511
Change-Id: I751ead56fca4adec28b991243a03cc516417ca3f
Reviewed-on: https://chromium-review.googlesource.com/1104799
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568175}