Revert "[wpa_supplicant] Cumulative patch from commit 0c5ededed" am: a5ae4a7eeb am: 8f330a9385 am: 112efbb7ea

Change-Id: Ic3a483c69d8f7895b9d6de4a33314ac316112077