Merge "wifi: Change WIFI_FEATURE_XXX type from int to long" into qt-qpr1-dev
am: 0710a7e6de

Change-Id: I62aabcf014bc069353619dc98ed65cea7eb4fe09