Merge "[automerger skipped] Merge "Move internal functions out of libnetd_resolv's public headers" into qt-dev am: d0ddd34084 -s ours am: befee4e13e -s ours
am: d8c4a4ae90 -s ours
am skip reason: change_id I66ab2f9856e7faa82c74a8ef3fbdeef579577c64 with SHA1 e4f96455d3 is in history

Change-Id: If375a6b45dda9e5eee40c79a6a5b0bbe2c8f1677