[automerger skipped] Merge "Move internal functions out of libnetd_resolv's...

[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 skip reason: change_id I66ab2f9856e7faa82c74a8ef3fbdeef579577c64 with SHA1 e4f96455d3 is in history

Change-Id: Iafcdb812c6b64631d9aac1569057127f80ba953b