Merge "Revert "Use apex/com.android.resolv/lib64/libned_resolv.so by default"" am: 40f96aff36
am: aac7fa53d4

Change-Id: I4469da7b26b20c3b28daff1ed997a58c763e98bc