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

Change-Id: I063c553c6e2afd34544f0dffc4de99d21b296626