Merge "bionic libc tests: clean up test_udp.c"