fix test and cleanup#1

ktoso merged 15 commits into

ktoso:wip-jextract-sub-directoriesktoso/swift-java:wip-jextract-sub-directoriesfrom

madsodgaard:jextract-sub-diretoriesmadsodgaard/swift-java:jextract-sub-diretoriesCopy head branch name to clipboard