Replace guava 11 with 16 and extract Guava as a separate dependency.