Merge "Fix build with ToT libc++" into main