wifi country code handling

Change-Id: Ib5670f4ed5470d5ddaaabf41759bfe4485c6578a
Merge branch 'wifi_country_code' into cm-10.1