Update to guava-16.0.1