Merge "Couple libbatteryservice headers with module."