Merge "Build symlinks for -host and -target phony modules"