m7: rename m7-gsm to m7 for merged GSM device tree
Merge branch 'cm-11.0' of https://github.com/TheMuppets/proprietary_vendor_htc into cd-4.4