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