cwm: Remove hardcoded paths

Change-Id: I1874f0bbbaa81e0eea507e9d9444307191eeb753
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0