Merge "healthd: batterymonitor uses AIDL HealthInfo."