Merge "healthd: Remove libhealthd dependency from charger"