init_d2lte: clean up cdma/gsm variant props

Change-Id: I2b4fc2407518e8b6edddbe69a1fd8f10bf475bf5

Conflicts:
	init/init_d2lte.c

Change-Id: Ia277db429e462cb48121d8e55512530aebf2452d
Merge "init_d2lte: clean up cdma/gsm variant props" into android-4.4