am d2fe982b: am 1c1b8354: Merge "Define fsid_t as well as __fsid_t."

* commit 'd2fe982beec5ab7a2c9cc07239f276e7fcbecc46':
  Define fsid_t as well as __fsid_t.