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

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