Use CM standard qcom naming

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