Merge branch 'users/chapuni/cov/merge/forfile' into users/chapuni/cov/merge/strategy
Conflicts:
llvm/test/tools/llvm-cov/Inputs/mcdc-templates-merge.cpp
llvm/test/tools/llvm-cov/Inputs/mcdc-templates-merge.yaml
llvm/test/tools/llvm-cov/branch-macros.test
llvm/test/tools/llvm-cov/mcdc-templates-merge.test