am b235f8c8: Merge "Fix dev_t (for LP64)."

* commit 'b235f8c8773c08569a97b0ff7e4c709b216c8478':
  Fix dev_t (for LP64).