Merge "Wifi: WAPI HAL skeleton"