Merge "[vold] pass sysfs_name to mount options" into sc-dev