Merge "Fix build with clang."