Merge "Add a version of doclava without guava built in"