am dedff62c: Merge "Contain obj of ../ source files in their intermediate dir."

* commit 'dedff62c8e44320dec8f667e27fdcd4cdff1430d':
  Contain obj of ../ source files in their intermediate dir.