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

Change-Id: I73a27d0f75fe0b3dc69ef2123d4180af1dac3dda