Merge "vold: only allow emmc_optimized on eMMC storage"