upgrade to guava 16.0
also fixes #4830