Merge "Revert "EGL BlobCache: Support multifile cache and flexible size...""