Pull changes from upstream buildsys to enable building subdirs in parallel.