Upgrade to guava 16.0