Merge "idmap: scan missing include for sys/stat.h"