Build and path handling adjustments to handle both old build system and swift-build#740

ktoso merged 4 commits into

swiftlang:mainswiftlang/swift-java:mainfrom

ktoso:wip-733-workaroundktoso/swift-java:wip-733-workaroundCopy head branch name to clipboard