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

Change-Id: Id4280035757ca0f998fadc2a6387fe9d6a3fcc6b