Merge "Try again to fix clang build."