Merge "[vold] pass along sysfs name in setOptions" into sc-dev