Fold base.git into ghc.git (re #8545)