Guava build

Change-Id: I92fc2364013309afaa1ea45acaccfd095c77b553