Merge "Remove deprecated and unused entryEvicted method."