moving vold mounts to main fstab