Merge "vold: remove unnecessary dependency on libbatteryservice."