m7-common: update wpa supplicant config

Change-Id: Ib7b0b4e912c9940ec5b7c8e5161f031e75ce0246
m7-common: build BCMDHD driver into kernel

Change-Id: Id42ffddd393533088f269b1dbb23f70e87f2358b
Merge remote-tracking branch 'cm/cm-11.0' into HEAD