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

Change-Id: If964c5c404e792eb59fb9164576b647b3cc7a5e2