Merge "logwrapper: turn on -Werror"