am 871bc703: Merge "Update build system for better Clang behavior on Mac."

* commit '871bc703e57d5b7629c043a54f5ac2614a17981b':
  Update build system for better Clang behavior on Mac.