wpa_supplicant: Add support for 2 iface types am: ea2a5ee1b5
am: c08c8f1183

Change-Id: I97a4f0ae608b12f4fdf19f90c92d8659366bcf37