Merge "vold: remove unnecessary dependency on libbatteryservice."

am: 7b0ac6d37e

Change-Id: I772e82a8ae54477014076be34b7dab5cb968fba7

diff --cc Android.mk
index e92955f,936374f..770f0b8
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -71,14 -67,8 +71,13 @@@ common_static_libraries := 
        libfec_rs \
        libsquashfs_utils \
        libscrypt_static \
-       libbatteryservice \
        libavb \
  
 +# TODO: include "cert-err34-c" once we move to Binder
 +# TODO: include "cert-err58-cpp" once 36656327 is fixed
 +common_local_tidy_flags := -warnings-as-errors=clang-analyzer-security*,cert-*
 +common_local_tidy_checks := -*,clang-analyzer-security*,cert-*,-cert-err34-c,-cert-err58-cpp
 +
  vold_conlyflags := -std=c11
  vold_cflags := -Werror -Wall -Wno-missing-field-initializers -Wno-unused-variable -Wno-unused-parameter