Merge "x86: Add vold.fstab to mount the SD card"