Portable DIRECTORY_SEPARATOR :)

Change-Id: I61d2ddc5367c2ffacd68c12bf9b6037cfc39d487
Merge "Portable DIRECTORY_SEPARATOR :)"