Merge changes Ia7c66ff3,I47a8d41d

* changes:
  Fix ResolverTest.BlockDnsQueryWithUidRule.
  fchown DNS lookup sockets to UID of the app that sent the DNS lookup.