msm7k: use CM standard naming

Change-Id: I19cd18b9f78c4248496bd1f9b84e97c788a5e437
Merge remote-tracking branch 'upstream/jellybean' into HEAD