Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev am: 74f7ccd680  -s ours am: ef0bc81641  -s ours
am: 195ea85e82  -s ours

Change-Id: I58bbf139d9fbf69f25faab38eced3d091bee20a6