Merge "Update build system for better Clang behavior on Mac."