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

Change-Id: I16520e6aa16e49b33bf393e2cdc3bd1ae8f3fdc4