am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge"

* commit '1be312dfb02e86731da6ac54a39956db791f4978':
  Re-enable -Wall and -Werror that were lost in a merge