init_jflte: clean up cdma/gsm variant props

Change-Id: If61f456521a4b85d578867bcc78d74cdbdaa36c6
Merge branch 'cm' into HEAD

Conflicts:
	init/init_jflte.c

Change-Id: Ida2f1787604519516748843c7799d758f485faf4
Signed-off-by: DHOMD <DHO@dho.im>