Also make it possible to compile with guava-16 and guava-17 (guava-16 removed the Closeables class and guava-17 reintroduced it, but with an API that has backwards compat issues)