init_jflte: clean up cdma/gsm variant props

Change-Id: If61f456521a4b85d578867bcc78d74cdbdaa36c6
add jflteusc to assert

how did we miss this? =/

Change-Id: Icf489ce050de49751e108c4340ed0d2afd5175ad
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0