Merge "installd: use correct header file." into jb-mr2-dev