Revert "This broke Wi-Fi direct"

This reverts commit facf1f74500b87d3e7ea075f42f2fd6cb886d8c2.
Merge branch 'kk-dev' of github.com:AndroidOpenSourceXperia/android_device_sony_montblanc-common into kk-dev