Revert "Advanced storage: vold swap storage paths"

This reverts commit 1ed207150ff00fe01f0219eccd5399718ab6459e.