Revert "track our vold"

This reverts commit 5658dfa77ce6f28bc037e12bca6b94bd7bc078bd.

Change-Id: I5bb16cef15572f4e282879d2edd724c388f4a363