Use a single binary for setting up wifi.
am: 32e8b94116

Change-Id: I9da02216e8101ad929453ddeb18e81a4276f8d62