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

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