Update to 1.8 / fix compilation with Guava 17