Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1