s4-common: older generation HTC radios do not support CELLINFOLIST

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