Merge "logcat: turn on -Werror"