am 36ccca15: Merge "toolbox: turn on -Werror"

* commit '36ccca155c03053397b953e4cc0ed8a8338d2450':
  toolbox: turn on -Werror