Merge "[automerger skipped] Merge "Move internal functions out of...
Merge "[automerger skipped] Merge "Move internal functions out of libnetd_resolv's public headers" into qt-dev am: d0ddd340 -s ours am: befee4e1 -s ours am skip reason: change_id I66ab2f9856e7faa82c74a8ef3fbdeef579577c64 with SHA1 e4f96455 is in history" into qt-r1-dev-plus-aosp