Merge "vold: clarify sysfs access"