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

Change-Id: I39a416dc5e1f272c7c2b4c8d335a3d1242204884