Upgrade Google Collections lib to Guava lib