Merge "Remove pathconf's dependencies on non-uapi header files."