Make it n8020 compatible (same as i925, with gsm and w/o cdma stuff).

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