Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade."

import com.google.mockwebserver.MockResponse;

import com.google.mockwebserver.MockWebServer;

import java.io.File;

import java.io.InputStream;

import java.net.CacheRequest;

import java.net.CacheResponse;

import java.net.ResponseCache;

        server.play();

        URLConnection c1 = server.getUrl("/").openConnection();

        assertEquals('A', c1.getInputStream().read());

        InputStream inputStream1 = c1.getInputStream();

        assertEquals('A', inputStream1.read());

        inputStream1.close();

        assertEquals(1, cache.getRequestCount());

        assertEquals(1, cache.getNetworkCount());

        assertEquals(0, cache.getHitCount());