Revert "[wpa_supplicant] Cumulative patch from commit 0c5ededed" am: a5ae4a7eeb am: c6714fa772 am: ddad30e995

Change-Id: I63e65f15a1892e7c031051e01a70e29909c9c322