Merge "vold: Add nvme disk support"