Merge "resolv_private.h: remove #define b64_ntop and b64_pton"