Integrate new blkid library.

27 files changed