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

Change-Id: I095f316ba5634bb34efc62a70c621100adba8b12