Merge "Don't apply clang flag to gcc builds."