Upgrade Guava, handle Shuffle changes.