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

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