Merge "Handle symlinked OUT_DIRs (again)"