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

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