Merge "installd: use correct header file."