Bye gsm.mk

Change-Id: I2e003cb7c08825c603f9aabd845874aee5b7bba5
Merge remote-tracking branch 'cm/cm-12.0' into HEAD