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