Revert "[wpa_supplicant] Cumulative patch from commit 0c5ededed" am: a5ae4a7eeb am: c6714fa772 am: c2b09cd515 am: d715ee383d am: a6d19352bc

Change-Id: I21f52b472ec724e250b41ee7ce1fedfabcb6be2a