Merge "Switch to OpenBSD res_random."

diff --cc libc/Android.mk
index 6beb7b3,2d87ebb..977469a
--- 1/libc/Android.mk
--- 2/libc/Android.mk
+++ b/libc/Android.mk
@@@ -642,9 -635,14 +642,15 @@@ LOCAL_SRC_FILES := 
      $(call all-c-files-under,dns) \
      upstream-netbsd/lib/libc/isc/ev_streams.c \
      upstream-netbsd/lib/libc/isc/ev_timers.c \
 +    upstream-netbsd/lib/libc/resolv/mtctxres.c \
  
- LOCAL_CFLAGS := \
+ # We use the OpenBSD res_random.
+ LOCAL_CFLAGS += \
+     -Dres_randomid=__res_randomid
+ LOCAL_SRC_FILES += \
+     upstream-openbsd/lib/libc/net/res_random.c \
+ 
+ LOCAL_CFLAGS += \
      $(libc_common_cflags) \
      -DANDROID_CHANGES \
      -DINET6 \

diff --cc libc/dns/resolv/res_init.c
Simple merge