[wpa_supplicant] Cumulative patch from commit c54a5e96b am: e21d4e8dc6 am: 842f03cd00

Change-Id: Ic2708b8b9e737a25ad43130d7cddcb1d4a84501c