Merge "healthd: separate libbatterymonitor for use in recovery."