Revert "BUG-7446: pull in guava-21"

No match.