Merge "Fix android.net.cts.ProxyTest" into froyo