am fb4ffd37: Merge "Use Map.Entry, not LinkedHashMap.Entry"

* commit 'fb4ffd37de2c4cdf0af962f960076dc7ba1c12ab':
  Use Map.Entry, not LinkedHashMap.Entry