Merge "Fixed build error with clang/llvm."