Merge "Fix clang build"