Merge "Handle rename of LruCache.entryEvicted to entryRemoved"