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

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