Revert "Merge branch 'du44' of https://github.com/DirtyUnicorns-KitKat/system_vold into HEAD"

This reverts commit a11c89af36167383bc3f0bf0e44e71d01ec94f48, reversing
changes made to bfd6de1a943ed37e6151b1b47279973d8d121ab2.