Merge "DnsResolverTest: Use AndroidJUnit4.class"