Merge "Add guava-tools.jar to manifest as temporary workaround"