Merge "Fix clang build."