Merge "wifi: Change WIFI_FEATURE_XXX type from int to long"