Use qcom path macros

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