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

* commit '8b36f7fcc7f1745a2dc6f2024c6b1b5fe6212450':
  Force some clang Werrors that *will* break things.