Fix build with Java 7
Add missing Guava dependency