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

Change-Id: Ie7afaaf44b8f4555095bbe75d77f4b7bd3e8b5a2