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

Change-Id: I230df9ced5d77945386f9b01b71bd115213a42e7