Rebase system/vold with SlimRoms repo

Change-Id: I0b23d4ab30b92a161605b22f1df713d2dd326ae3