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

* commit 'e99cb20d68382ae53fecc819ff5fcb2c1e348161':