Merge branch 'ios' into master-merge-ios

Conflicts:
	compiler/llvmGen/Llvm/PpLlvm.hs
	compiler/llvmGen/LlvmCodeGen/CodeGen.hs
	compiler/llvmGen/LlvmCodeGen/Ppr.hs
	compiler/main/DriverPipeline.hs
	ghc.mk
	includes/ghc.mk
	packages
	rules/build-dependencies.mk
	utils/ghc-cabal/ghc-cabal.cabal
	utils/hpc/hpc-bin.cabal
Merge branch 'master-merge-ios' of github.com:ghc-ios/ghc into master-merge-ios