Merge "Use apex/com.android.resolv/lib64/libned_resolv.so by default"
am: 87e10ba280

Change-Id: I0d43b11a93e73acd30123f90276f7c6e2d722075