am 3c742c99: am 92c58474: am afa10292: Merge "logcat: turn on -Werror"

* commit '3c742c9995ed4bf95ff5bfcfb373c1e94326b190':
  logcat: turn on -Werror