n1: Remove gsm makefile, re-order

Change-Id: I5b8107626f915d7883381652894ac22aba508aa3