Upgrade guava 16.0.1, remove deprecated api