Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"