am 7669f1c8: am 2e92fe36: am 39f2ec2f: Merge "logwrapper: turn on -Werror"

* commit '7669f1c8c447b4c66a6ad05c71bec27ff5ff3853':
  logwrapper: turn on -Werror