More fixes (birdman's repo)
m7-common: update wpa_supplicant config

Change-Id: Iaf2aa51327463ee88050c1890f2d5231e41d92a1
derp
Merge branch 'kk' of http://github.com/Carbon-m7/android_device_htc_m7-common into kk