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

* commit '2e92fe36ffdb9ffeeeea00f111336a61a65b40f7':
  logwrapper: turn on -Werror