Merge "Only add jacocoagent if the package contains some java code." into nyc-dev