Use Guava 16 which does not have compatibility issues

Change-Id: I721aad96dfec12c0b053c75707870207ccf049be