Merge "Move some of the logic from egl_cache_t into FileBlobCache"