Merge "Wifi: add WAPI constants and fields"