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

* commit '6e048afb4bcac4118b09cc0dd01f0ca2a797a95a':
  Update build system for better Clang behavior on Mac.