Merge "WificondControl: Use IWificond for start/stop supplicant"