Merge "Fix CacheManager.getCacheFile() with the Chromium HTTP stack"