init_d2lte: clean up cdma/gsm variant props

Change-Id: I2b4fc2407518e8b6edddbe69a1fd8f10bf475bf5
init_d2lte: clean up cdma/gsm variant props

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