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

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