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

Change-Id: I7efb2dd4ff1bfbc0e9ec16fcb29e4b2e50e9e163