Merge "Remove access to 'sysfs' files from healtd and charger."