n1: Remove gsm makefile, re-order

Change-Id: I5b8107626f915d7883381652894ac22aba508aa3
Merge branch 'remote' into mkl

Conflicts:
	cm.mk

Change-Id: I684d76d3abc1e96d77ddb9253b0dc953850e30c4