Merge "Revert "EGL: Refactor multifile blobcache""