am f984afd0: am 57722375: Merge "We don\'t need two copies of <nsswitch.h>."

* commit 'f984afd0ef2185d493c03830537460edf34baefc':
  We don't need two copies of <nsswitch.h>.