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

Change-Id: If3e5cce5bc9b07f4ddf41e99f743fec84e46720e