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

Change-Id: I05e44ddb98a737b91332d7b983282f0418d508e1