am 60e11324: am 4d695bf5: Merge "Align struct passwd definition with other variations of libc"

* commit '60e1132460aec1dbe191dc3d2c8fec6073163824':
  Align struct passwd definition with other variations of libc