Avoid using non portable separator character

Instead of manually concatenating and using non portable separator
characters, use the more portable Path methods to do the same.

Change-Id: Ibd5386952bfafe557cace0dceb8a894778a294e2
2 files changed