Merge "healthd: Remove access to /sys/class/power_supply/battery/batt_vol and batt_temp"