am 5f829205: am c1416647: Merge "Clean up internal libc logging."

* commit '5f8292050fc07f4bf9e70f37a807ad028e3cfc87':
  Clean up internal libc logging.

diff --cc libc/Android.mk
Simple merge

diff --cc libc/netbsd/resolv/res_cache.c
Simple merge

diff --cc libc/netbsd/resolv/res_send.c
Simple merge

diff --cc libc/netbsd/resolv/res_state.c
Simple merge