m7 GSM models are now combined in one device tree

Change-Id: I5003d82c6b1a1df9bc1e8549dc2332c468be6b07