Merge "Test LinkedHashMap.removeEldestEntry() implementation that modifies underlying map" am: 95bc7388 am: 04e86f88 Change-Id: I8351a5e9a65ed2d3e6ed1b74638a472fa317adec