Revert "update layout for vold managed devices"

This reverts commit 70e966105a653b1c088560aa33607d1c401f0d51.