mm-core: Use CM standard QCOM naming for 7x30

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