Merge "mediaserver: remove access to 'sysfs' type."