fix wifi: stop overwriting ctrl_interface in /data/misc/wifi/*.conf
for test: change wlan1 interface to p2p0 because WifiP2pService requested p2p0 and WifiHW requested p2p0 socket
revert previous commit
Merge pull request #4 from munjeni/cm-10.2

Cm 10.2