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

* commit '4d695bf5606f2cf4029a7ff4e6dd61073407d3b0':
  Align struct passwd definition with other variations of libc