Merge "Handle symlinked OUT_DIRs (again)" am: fe09018
am: b101826

* commit 'b101826b15e53f5af2132c5dd5bd9e59a294edc9':
  Handle symlinked OUT_DIRs (again)