Merge "Use apex/com.android.resolv/lib64/libned_resolv.so by default"