Merge "Merge "Add control flags in asynchronous DNS query API" am: c04f9f73...

    return android_getaddrinfofornet(node, service, hints, netid, 0, res);

}

int android_res_nquery(net_handle_t network, const char *dname, int ns_class, int ns_type) {

int android_res_nquery(net_handle_t network, const char *dname,

        int ns_class, int ns_type, enum ResNsendFlags flags) {

    unsigned netid;

    if (!getnetidfromhandle(network, &netid)) {

        return -ENONET;

    }

    return resNetworkQuery(netid, dname, ns_class, ns_type);

    return resNetworkQuery(netid, dname, ns_class, ns_type, flags);

}

int android_res_nresult(int fd, int *rcode, uint8_t *answer, size_t anslen) {

    return resNetworkResult(fd, rcode, answer, anslen);

}

int android_res_nsend(net_handle_t network, const uint8_t *msg, size_t msglen) {

int android_res_nsend(net_handle_t network, const uint8_t *msg, size_t msglen,

        enum ResNsendFlags flags) {

    unsigned netid;

    if (!getnetidfromhandle(network, &netid)) {

        return -ENONET;

    }

    return resNetworkSend(netid, msg, msglen);

    return resNetworkSend(netid, msg, msglen, flags);

}

void android_res_cancel(int nsend_fd) {