Merge "Improve BUILDDIR handling with symlinks"