[Git][ghc/ghc][wip/rafl/hpc-tixdir] 2 commits: Merge tix data