Fix UMTS/HSDPA indicator

I f**ked up the overlay again :)
Remove p2p support completely

Change-Id: Iac70afc699df88b2b852d2c4af8918741989eb56
Wifi cleanup

Change-Id: Ie19868a5edf89431daf55a48494d335ddd13c15b