Merge "Wifi: don't require C++11."
am: 13be232d7b

Change-Id: Ib8b8aeea631b46ddd4310e1c32dd71f092fd6c9e