Remove Stk and spn-conf.xml from cdma.mk... and don't set that gsm phone prop to 2\!

Change-Id: I3521e9a17afe7dbde19094c890e5fd797091cc61