am 6cdab387: Merge "Restore <nsswitch.h> which is BSD API, not private."

* commit '6cdab387b3fa6900ba918318edc426b5cb62b66e':
  Restore <nsswitch.h> which is BSD API, not private.