Merge "Add a version of doclava without guava built in"
am: 25ef586c68

Change-Id: Ib5a033e8bfe72b78aba1cbc8b3055fe0151564ef