Merge "Restore <nsswitch.h> which is BSD API, not private."
authorElliott Hughes <enh@google.com>
Mon, 30 Jun 2014 23:03:21 +0000 (23:03 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 30 Jun 2014 22:33:03 +0000 (22:33 +0000)

Trivial merge