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

Change-Id: I1faae4261398a107aee274a7b6a4b05766786257