omap4-common: fix wifi/p2p-config

use right config-file for wifi and p2p and enable p2p on the
p2p-interface

Change-Id: I3add89572ebd3d14bd1d56b77702dac7bf64184f
Merge branch 'cm' into HEAD
omap4-common: switch wpa_supplicant back to the normal version

this is needed to fix wifi instability and high power-usage
caused by a change to the wpa_supplicant_lib.

Change-Id: Ia4f12fd36f22e4266ef68141f6d18e1fe333a432
Merge remote-tracking branch 'cm/cm-11.0' into HEAD
Merge remote-tracking branch 'upstream/kk44' into kk44