Merge "Use NOVA_BIN_DIR / SWIFT_BIN_DIR for binaries"