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

Change-Id: Id2d352f1f774a78bf389b6927591c778bb8eb072