cleanup

Change-Id: I6939d66041559f927c0958922e6905186549bbdb
Switch to mainline wpa supplicant

(cherry picked from commit 1f5c873cf5cb2ad8dae59f25edf9204cb54a0972)

Change-Id: Ia23f1f5e167f136ca1f48348e77b54729e88341d