Merge "Fix guava classpath"