Revert "Rebase system/vold with SlimRoms repo"

This reverts commit 0d046cc1d8bc34816f75b9701c2b74de02a8e0aa.