Merge "healthd: Remove libhealthd dependency from charger" am: daabad7cd8 am: 3dad01d387
am: 835729323b

Change-Id: I1001d7fd47a61620a556851d6e455f5a2f7b88d8