[Reviewer: Andy] Take mainstream version of gcovr