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

Change-Id: Ib974d20a6b8b8c4bdd5f8d153bcf4840d3cc317a