Support use of gcov and lcov for debug builds part 2