revert reversion

This reverts commit 7bfc4a544271269a22422b9884c80384820bc8eb.

Android build is going to have consistent versions again.
Remove hurd stuff from cabal file, since hackage currently rejects it.

https://github.com/haskell/hackage-server/issues/269
warnings
android rebuild WIP
Merge orca:/tmp/git-annex
Merge branch 'master' of ssh://git-annex.branchable.com