Merge "Tolerate cache files being removed from underneath DiskLruCache"