Merge "Include guava in ddms manifest"