am afa10292: Merge "logcat: turn on -Werror"

* commit 'afa102924a97a8d2636d8c093565adcf34832e9a':
  logcat: turn on -Werror