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

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