Use qcom path macros

Change-Id: I050522c8806fcc1b302f7e6b43d1e8270c62d394
Merge branch 'cm' into HEAD