Merge "vold: remove unnecessary dependency on libbatteryservice."
am: 7b0ac6d37e

Change-Id: I772e82a8ae54477014076be34b7dab5cb968fba7