update
avoid parallel cabal

Works around https://github.com/haskell/cabal/issues/2164
Merge branch 'master' of github.com:joeyh/ghc-android

Conflicts:
	patches/cabal-wrapper