Merge "logd: turn on -Werror"