Merge "Bug 8077888 - handle multiple coverage files being generated."