Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost"