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

* commit 'e2fb764c3b1c3285bbc78f5e9a0c70785d2383f5':
  toolbox: turn on -Werror