Merge "Define fsid_t as well as __fsid_t."