Fix paths back to /h/w/c based

Change-Id: I8f65ead26df4c690a7b5a655bc61e1d4af64d964