cleaned up paths and path separators (again)

Change-Id: If8fe1781c1e1b6e455afead182dfb29b77f4b78c
Merge "cleaned up paths and path separators (again)"
Updated patch level for _thisrepo_