Merge "Work in progress to enable build system support for Clang."