Merge "Keep WIFI_FEATURE defines in sync with HAL"