Merge "Fix Clang build."