GitLab

Also clean up the code a little in the process, getting rid of
differentiated trackers for each subtask.

Bug: 714018
Change-Id: Ibe2f20ef7748a82a10f284cb346b1614c80f394a
Reviewed-on: https://chromium-review.googlesource.com/833247Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#525193}