Replacing hard-coded subdir. Make some paths absolute.

Change-Id: I728a8e52a18ff7cf4a58eb12828f356e1c9da7c7
JIRA: REL-1031