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