upgrade to guava 16