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

Change-Id: Ib7f163b0e41b33788a6824d0042c05447e55e0be