Merge "Use a version script to hide symbols in libnetd_resolv.so"