Cherry-pick cf9e1837 into ghc-8.8

Ensure that the hpc submodule is pointing to a commit on master on the ghc-8.8 branch as well.