Merge "Installd: Fix Clang build"