Merge "Fix guava classpath"
am: 149fa628e5

Change-Id: I827699e1aaaa64a35dfd3083e15a7ceef28a9149