Use CM standard qcom naming

Change-Id: I5b0edd9f9b8b7e7adbdf4dd399e3734afdb2aaa1
Merge remote-tracking branch 'cm/cm-10.2' into HEAD