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

* commit '46cb2ee3cb120a1c03241e9e2aa66d76c890c486':
  Force some clang Werrors that *will* break things.