update to guava 16