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

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