Merge "toolbox: turn on -Werror"