am 2bb996f6: am 46cb2ee3: Merge "Force some clang Werrors that *will* break things."

* commit '2bb996f6a58dd4b9e682f9c59a7dad94412bdd86':
  Force some clang Werrors that *will* break things.