Merge "installd: fix build with ToT LLVM" into main