Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b
am: 9db7223591

Change-Id: I50e0de71d4fc0de18d7bf0c21c4f1a2518530f36