Merge "supplicant(interface): Remove "wpa_supplicant"" am: 22373cb4b8 am: 8a7468c287
am: 9c0878cd7a

Change-Id: I5c2cc6fb32aa6e6d2e7453e905440d6056eccf29