Merge "bionic: Replace iface with opaque netid in resolver."