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

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