* commit '1d3d0360eee442c7c73006e2069acdc051575edb': Allow overlap in resolv uid => DNS iface mapping
This is part of the upstream sync (Net/Open/Free BSDs expose the nameser.h in their public headers). Change-Id: Ib063d4e50586748cc70201a8296cd90d2e48bbcf
Bug: 13219633 Change-Id: Ide43add0b90b3081cc709a22d1ff1f59d65f1104