Merge "HostStubGen: Fix jarjar rule on guava" into main