Merge "Verbatim import hostent.h and res_comp.c from bionic"